[SCM] Samba Shared Repository - branch master updated -
d115c4587f0d157fcb7f716524d92fbe1899f44c
Günther Deschner
gd at samba.org
Thu Oct 23 00:11:22 GMT 2008
The branch, master has been updated
via d115c4587f0d157fcb7f716524d92fbe1899f44c (commit)
via c017909e2e2f971c68303b98b4a8a5b9019b0f6d (commit)
via 74a9a391aa98dda542ef413d46d2080b450be127 (commit)
from f9c6313e660e7a6dc78c124ffb88c1258c5a5025 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d115c4587f0d157fcb7f716524d92fbe1899f44c
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 01:43:41 2008 +0200
s3-build: fix some const build warnings.
Guenther
commit c017909e2e2f971c68303b98b4a8a5b9019b0f6d
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 01:43:06 2008 +0200
netapi: NetGroupEnum_r needs to handle servers with no groups.
Guenther
commit 74a9a391aa98dda542ef413d46d2080b450be127
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 01:42:27 2008 +0200
s3-samr-server: _samr_DeleteUser needs to wipe out the user_handle on success.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/lib/netapi/group.c | 2 +-
source3/libsmb/clispnego.c | 4 ++--
source3/rpc_server/srv_samr_nt.c | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 8dba4b8..95c012a 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -1243,7 +1243,7 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
goto done;
}
- if (r->out.resume_handle) {
+ if (r->out.resume_handle && info.info3.count > 0) {
*r->out.resume_handle =
info.info3.entries[info.info3.count-1].idx;
}
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index fd312a4..fb95d71 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -152,7 +152,7 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
const char *oid_str = NULL;
asn1_read_OID(data,NULL,&oid_str);
- OIDs[i] = oid_str;
+ OIDs[i] = CONST_DISCARD(char *, oid_str);
}
OIDs[i] = NULL;
asn1_end_tag(data);
@@ -257,7 +257,7 @@ bool parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
const char *oid_str = NULL;
asn1_read_OID(data,NULL,&oid_str);
- OIDs[i] = oid_str;
+ OIDs[i] = CONST_DISCARD(char *, oid_str);
}
OIDs[i] = NULL;
asn1_end_tag(data);
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index d08bb50..36be832 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -4908,6 +4908,8 @@ NTSTATUS _samr_DeleteUser(pipes_struct *p,
if (!close_policy_hnd(p, r->in.user_handle))
return NT_STATUS_OBJECT_NAME_INVALID;
+ ZERO_STRUCTP(r->out.user_handle);
+
force_flush_samr_cache(disp_info);
return NT_STATUS_OK;
--
Samba Shared Repository
More information about the samba-cvs
mailing list