The branch, master has been updated
via faa7ae4 s4:smbd/process*.c - fix PID warnings on Solaris
via c7b2ec6 s4:kdc/proxy.c - optimise includes in order to fix a build
warning on Tru64
via 6b2a19d s4:param/loadparm.c - fix a warning by introducing a
"const" cast
via 3c38166 s4:kdc/kpasswdd.c - don't return an uninitialised NT_STATUS
from 24cac44 build: change lib order to fix build on netbsd
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit faa7ae47d675c3007e53737eef70c34675e952ba
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Dec 12 12:33:08 2010 +0100
s4:smbd/process*.c - fix PID warnings on Solaris
Autobuild-User: Matthias Dieter Wallnöfer <m...@samba.org>
Autobuild-Date: Sun Dec 12 13:21:13 CET 2010 on sn-devel-104
commit c7b2ec6fbb74955f787c492eec1e06558d523ecb
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Dec 12 12:15:51 2010 +0100
s4:kdc/proxy.c - optimise includes in order to fix a build warning on Tru64
commit 6b2a19d50bc29aa4c905e437fc2002c3c959d4e8
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Dec 12 12:07:24 2010 +0100
s4:param/loadparm.c - fix a warning by introducing a "const" cast
commit 3c38166cdb97cba52a11fe2e15445b45bef15de0
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Sun Dec 12 11:58:59 2010 +0100
s4:kdc/kpasswdd.c - don't return an uninitialised NT_STATUS
Discovered by Tru64 build
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/kpasswdd.c | 3 +--
source4/kdc/proxy.c | 7 +------
source4/param/loadparm.c | 2 +-
source4/smbd/process_onefork.c | 2 +-
source4/smbd/process_prefork.c | 4 ++--
source4/smbd/process_standard.c | 4 ++--
6 files changed, 8 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 6f4c84b..2c879c3 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -519,8 +519,7 @@ enum kdc_process_ret kpasswdd_process(struct kdc_server
*kdc,
ret = kpasswdd_make_unauth_error_reply(kdc, mem_ctx,
KRB5_KPASSWD_HARDERROR,
talloc_asprintf(mem_ctx,
- "Failed
to obtain server credentials for kadmin/changepw: %s\n",
-
nt_errstr(nt_status)),
+ "Failed
to obtain server credentials for kadmin/changepw!"),
&krb_priv_rep);
ap_rep.length = 0;
if (ret) {
diff --git a/source4/kdc/proxy.c b/source4/kdc/proxy.c
index 3929a12..6179bf1 100644
--- a/source4/kdc/proxy.c
+++ b/source4/kdc/proxy.c
@@ -24,14 +24,9 @@
#include "smbd/process_model.h"
#include "lib/tsocket/tsocket.h"
#include "libcli/util/tstream.h"
-#include "system/network.h"
-#include "param/param.h"
#include "lib/stream/packet.h"
#include "kdc/kdc-glue.h"
-#include "ldb.h"
-#include "librpc/gen_ndr/drsblobs.h"
-#include "dsdb/schema/schema.h"
-#include "dsdb/common/proto.h"
+#include "dsdb/samdb/samdb.h"
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index e7a0aac..531789e 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1710,7 +1710,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int
parmnum, void *parm_ptr,
pszParmName,
pszParmValue));
return false;
}
- *(const char ***)parm_ptr = new_list;
+ *(const char ***)parm_ptr = (const char
**) new_list;
break;
}
}
diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c
index 5194e1b..59e583d 100644
--- a/source4/smbd/process_onefork.c
+++ b/source4/smbd/process_onefork.c
@@ -111,7 +111,7 @@ static void onefork_new_task(struct tevent_context *ev,
smb_panic("Failed to re-initialise tevent after fork");
}
- setproctitle("task %s server_id[%d]", service_name, pid);
+ setproctitle("task %s server_id[%d]", service_name, (int)pid);
onefork_reload_after_fork();
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c
index 71c1c57..66222af 100644
--- a/source4/smbd/process_prefork.c
+++ b/source4/smbd/process_prefork.c
@@ -122,7 +122,7 @@ static void prefork_new_task(struct tevent_context *ev,
is not associated with this new connection */
talloc_free(ev);
- setproctitle("task %s server_id[%d]", service_name, pid);
+ setproctitle("task %s server_id[%d]", service_name, (int)pid);
prefork_reload_after_fork();
@@ -151,7 +151,7 @@ static void prefork_new_task(struct tevent_context *ev,
return;
} else {
pid = getpid();
- setproctitle("task %s server_id[%d]", service_name,
pid);
+ setproctitle("task %s server_id[%d]", service_name,
(int)pid);
prefork_reload_after_fork();
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index 99e815a..c5cd9fd 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -133,7 +133,7 @@ static void standard_accept_connection(struct
tevent_context *ev,
s = socket_get_my_addr(sock2, ev);
if (s && c) {
setproctitle("conn c[%s:%u] s[%s:%u] server_id[%d]",
- c->addr, c->port, s->addr, s->port, pid);
+ c->addr, c->port, s->addr, s->port, (int)pid);
}
talloc_free(c);
talloc_free(s);
@@ -186,7 +186,7 @@ static void standard_new_task(struct tevent_context *ev,
/* Ensure that the forked children do not expose identical random
streams */
set_need_random_reseed();
- setproctitle("task %s server_id[%d]", service_name, pid);
+ setproctitle("task %s server_id[%d]", service_name, (int)pid);
/* setup this new task. Cluster ID is PID based for this process modal
*/
new_task(ev, lp_ctx, cluster_id(pid, 0), private_data);
--
Samba Shared Repository
