[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-718-g956740a

Matthias Dieter Wallnöfer mdw at samba.org
Fri Sep 25 03:54:49 MDT 2009


The branch, master has been updated
       via  956740aa6fe59940bd59786e096d4062288fa587 (commit)
       via  85276e120c192b6a874f51ddee9b59339a87753b (commit)
       via  fb1eb112672c30d7086881922036066b55436a01 (commit)
      from  0650423edf72a07c55ec1f9516f657d635c3a49a (commit)

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


- Log -----------------------------------------------------------------
commit 956740aa6fe59940bd59786e096d4062288fa587
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Wed Sep 23 19:40:14 2009 +0200

    s4:LDIFs - enhance the section comments

commit 85276e120c192b6a874f51ddee9b59339a87753b
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Fri Sep 25 10:43:42 2009 +0200

    s4:auth/gensec/schannel - fix a const warning

commit fb1eb112672c30d7086881922036066b55436a01
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Fri Sep 25 10:17:17 2009 +0200

    s3:smbd/password - move list pointers into blocks

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

Summary of changes:
 source3/smbd/password.c                    |   12 ++++++------
 source4/auth/gensec/schannel.c             |    3 ++-
 source4/setup/provision.ldif               |    4 ++++
 source4/setup/provision_configuration.ldif |    8 ++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 4c1cef4..755ff5d 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -551,14 +551,13 @@ bool user_in_list(struct smbd_server_connection *sconn,
 static bool user_ok(struct smbd_server_connection *sconn,
 		    const char *user, int snum)
 {
-	char **valid, **invalid;
 	bool ret;
 
-	valid = invalid = NULL;
 	ret = True;
 
 	if (lp_invalid_users(snum)) {
-		invalid = str_list_copy(talloc_tos(), lp_invalid_users(snum));
+		char **invalid = str_list_copy(talloc_tos(),
+			lp_invalid_users(snum));
 		if (invalid &&
 		    str_list_substitute(invalid, "%S", lp_servicename(snum))) {
 
@@ -570,11 +569,12 @@ static bool user_ok(struct smbd_server_connection *sconn,
 						    (const char **)invalid);
 			}
 		}
+		TALLOC_FREE(invalid);
 	}
-	TALLOC_FREE(invalid);
 
 	if (ret && lp_valid_users(snum)) {
-		valid = str_list_copy(talloc_tos(), lp_valid_users(snum));
+		char **valid = str_list_copy(talloc_tos(),
+			lp_valid_users(snum));
 		if ( valid &&
 		     str_list_substitute(valid, "%S", lp_servicename(snum)) ) {
 
@@ -586,8 +586,8 @@ static bool user_ok(struct smbd_server_connection *sconn,
 						   (const char **)valid);
 			}
 		}
+		TALLOC_FREE(valid);
 	}
-	TALLOC_FREE(valid);
 
 	if (ret && lp_onlyuser(snum)) {
 		char **user_list = str_list_make_v3(
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 69c50f8..f911dd3 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -314,7 +314,8 @@ static NTSTATUS schannel_check_packet(struct gensec_security *gensec_security,
 				struct schannel_state);
 
 	return netsec_incoming_packet(state, mem_ctx, false,
-				      data, length, sig);
+				      discard_const_p(uint8_t, data),
+				      length, sig);
 }
 /*
   seal a packet
diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index d46406e..0e30efc 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -131,6 +131,8 @@ objectClass: dfsConfiguration
 isCriticalSystemObject: TRUE
 showInAdvancedViewOnly: FALSE
 
+# Domain updates
+
 dn: CN=DomainUpdates,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
@@ -360,6 +362,8 @@ objectClass: top
 objectClass: container
 revision: 8
 
+# End domain updates
+
 dn: CN=File Replication Service,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: applicationSettings
diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index 9a3c03c..48b4dad 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -639,6 +639,8 @@ appliesTo: bf967a8f-0de6-11d0-a285-00aa003049e2
 localizationDisplayId: 28
 validAccesses: 256
 
+# End extended rights
+
 # Forest updates
 
 dn: CN=ForestUpdates,${CONFIGDN}
@@ -802,6 +804,8 @@ objectClass: top
 objectClass: container
 revision: 9
 
+# End forest updates
+
 dn: CN=LostAndFoundConfig,${CONFIGDN}
 objectClass: top
 objectClass: lostAndFound
@@ -848,6 +852,8 @@ nETBIOSName: ${DOMAIN}
 nTMixedDomain: 0
 systemFlags: 3
 
+# End partitions
+
 dn: CN=Physical Locations,${CONFIGDN}
 objectClass: top
 objectClass: locality
@@ -975,6 +981,8 @@ lDAPAdminLimits: MaxConnIdleTime=900
 lDAPAdminLimits: InitRecvTimeout=120
 lDAPAdminLimits: MaxConnections=5000
 
+# End services
+
 # Sites
 
 dn: CN=Sites,${CONFIGDN}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list