[SCM] Samba Shared Repository - branch master updated - 931f16f6229f16eac866934f65f567c200d4b111

Günther Deschner gd at samba.org
Mon Dec 1 23:54:43 GMT 2008


The branch, master has been updated
       via  931f16f6229f16eac866934f65f567c200d4b111 (commit)
       via  61a6b49e48f9d58c50a1be8e3b55ed49ceba5344 (commit)
       via  b07d3794d25eddf53fa1d313eff3dfd8781469d9 (commit)
      from  798c4b3e6a27a09a9156f7476cf5bb4151741652 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 931f16f6229f16eac866934f65f567c200d4b111
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 2 00:08:56 2008 +0100

    s3-samr: _samr_EnumDomainUsers always returns a sam array (even w/o users).
    
    Guenther

commit 61a6b49e48f9d58c50a1be8e3b55ed49ceba5344
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 01:51:38 2008 +0100

    s3-passdb: remove unused (now samr.idl) ACCT_NT/LM_PWD_SET flags.
    
    Guenther

commit b07d3794d25eddf53fa1d313eff3dfd8781469d9
Author: Günther Deschner <gd at samba.org>
Date:   Sat Nov 29 00:23:16 2008 +0100

    s3-samr: refuse do process UserSetInfo with 0 fields_present.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/include/passdb.h         |   10 ----------
 source3/rpc_server/srv_samr_nt.c |   14 +++++++++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 360a0d0..744b723 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -23,16 +23,6 @@
 #ifndef _PASSDB_H
 #define _PASSDB_H
 
-
-/*
- * in samba4 idl
- * ACCT_NT_PWD_SET == SAMR_FIELD_PASSWORD and
- * ACCT_LM_PWD_SET == SAMR_FIELD_PASSWORD2
- */
-
-#define ACCT_NT_PWD_SET		0x01000000
-#define ACCT_LM_PWD_SET		0x02000000
-
 /*
  * bit flags representing initialized fields in struct samu
  */
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 7cc4b2c..dc2377b 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1012,6 +1012,7 @@ NTSTATUS _samr_EnumDomainUsers(pipes_struct *p,
 	if (!samr_array) {
 		return NT_STATUS_NO_MEMORY;
 	}
+	*r->out.sam = samr_array;
 
 	become_root();
 
@@ -1071,7 +1072,6 @@ NTSTATUS _samr_EnumDomainUsers(pipes_struct *p,
 	samr_array->entries = samr_entries;
 
 	*r->out.resume_handle = *r->in.resume_handle + num_account;
-	*r->out.sam = samr_array;
 	*r->out.num_entries = num_account;
 
 	DEBUG(5,("_samr_EnumDomainUsers: %d\n", __LINE__));
@@ -3891,6 +3891,10 @@ static NTSTATUS set_user_info_21(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
+	if (id21->fields_present == 0) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	if (id21->fields_present & SAMR_FIELD_LAST_PWD_CHANGE) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
@@ -3974,6 +3978,10 @@ static NTSTATUS set_user_info_23(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
+	if (id23->info.fields_present == 0) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	if (id23->info.fields_present & SAMR_FIELD_LAST_PWD_CHANGE) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
@@ -4142,6 +4150,10 @@ static NTSTATUS set_user_info_25(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
+	if (id25->info.fields_present == 0) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	if (id25->info.fields_present & SAMR_FIELD_LAST_PWD_CHANGE) {
 		return NT_STATUS_ACCESS_DENIED;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list