[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2382-gd85a278

Günther Deschner gd at samba.org
Mon Feb 18 09:18:20 GMT 2008


The branch, v3-2-test has been updated
       via  d85a2782a483e563a8b68924d4897a145bc25896 (commit)
       via  2b1eead269e95142576d0c8c259874324ba83502 (commit)
       via  a1d07469236c06b65f14a59a27d7f7abcb106b5e (commit)
      from  b62eddbc4e302d3849525d8f6af24b112a4fe483 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit d85a2782a483e563a8b68924d4897a145bc25896
Author: Tim Potter <tpot at hp.com>
Date:   Mon Feb 18 10:24:51 2008 +1100

    Fix off-by-one bugs in subcommand argument passing.

commit 2b1eead269e95142576d0c8c259874324ba83502
Author: Tim Potter <tpot at hp.com>
Date:   Mon Feb 18 10:21:50 2008 +1100

    Check return code of secrets_init() function.

commit a1d07469236c06b65f14a59a27d7f7abcb106b5e
Author: Tim Potter <tpot at hp.com>
Date:   Mon Feb 18 10:21:17 2008 +1100

    Replace C++-style comments with C.

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

Summary of changes:
 source/client/smbmnt.c          |    2 +-
 source/rpc_server/srv_samr_nt.c |    8 ++++----
 source/rpcclient/cmd_samr.c     |    8 ++++----
 source/smbd/server.c            |    3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/smbmnt.c b/source/client/smbmnt.c
index 198faca..3d7de1b 100644
--- a/source/client/smbmnt.c
+++ b/source/client/smbmnt.c
@@ -251,7 +251,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
                 return -1;
         }
 
-        data.uid = mount_uid;    // truncates to 16-bits here!!!
+        data.uid = mount_uid;    /* truncates to 16-bits here!!! */
         data.gid = mount_gid;
         data.file_mode = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_fmask;
         data.dir_mode  = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_dmask;
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 0db74c2..df7bb9b 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -2535,10 +2535,10 @@ static NTSTATUS get_user_info_21(TALLOC_CTX *mem_ctx,
 			      logon_hours,
 			      pdb_get_bad_password_count(pw),
 			      pdb_get_logon_count(pw),
-			      0, //country_code,
-			      0, //code_page,
-			      0, //nt_password_set,
-			      0, //lm_password_set,
+			      0, /* country_code */
+			      0, /* code_page */
+			      0, /* nt_password_set */
+			      0, /* lm_password_set */
 			      password_expired);
 	TALLOC_FREE(pw);
 
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index f8b8ba8..8b4ee47 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -1044,8 +1044,8 @@ static NTSTATUS cmd_samr_enum_domains(struct rpc_pipe_client *cli,
 		return NT_STATUS_OK;
 	}
 
-	if (argc > 2) {
-		sscanf(argv[2], "%x", &access_mask);
+	if (argc > 1) {
+		sscanf(argv[1], "%x", &access_mask);
 	}
 
 	/* Get sam policy handle */
@@ -1194,11 +1194,11 @@ static NTSTATUS cmd_samr_query_aliasinfo(struct rpc_pipe_client *cli,
 
 	sscanf(argv[2], "%i", &alias_rid);
 
-	if (argc > 3) {
+	if (argc > 2) {
 		level = atoi(argv[3]);
 	}
 
-	if (argc > 4) {
+	if (argc > 3) {
 		sscanf(argv[4], "%x", &access_mask);
 	}
 
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 7116027..7bf11ab 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -988,7 +988,8 @@ static bool init_structs(void )
 
 	init_dptrs();
 
-	secrets_init();
+	if (!secrets_init())
+		return False;
 
 	return True;
 }


-- 
Samba Shared Repository


More information about the samba-cvs mailing list