[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2500-g06d15d8

Jeremy Allison jra at samba.org
Sat Feb 23 00:20:36 GMT 2008


The branch, v3-2-test has been updated
       via  06d15d8a9f94a50337ebf6f651a004bb8b4821f3 (commit)
       via  d265cedb55b07c6b8a13b9632fbdf8a05fbba886 (commit)
       via  bcc5371b8e7f369e8d830d9cf687089514997248 (commit)
       via  9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18 (commit)
       via  beb0a76b93f9dd054dbc4192516e7008e59b27d9 (commit)
       via  3957ada4b6aa1f349ac1504125c4013512829ced (commit)
       via  847874ca757ac8ca32082305c8caed5abc7fed1d (commit)
       via  58b0f022ffce7fda531f6f8ea7392a963e8ec0c5 (commit)
      from  ce57d388251063c22f89680e9d1c2129d9879975 (commit)

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


- Log -----------------------------------------------------------------
commit 06d15d8a9f94a50337ebf6f651a004bb8b4821f3
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 22 16:19:59 2008 -0800

    Fix "used uninitialized" errors.
    Jeremy.

commit d265cedb55b07c6b8a13b9632fbdf8a05fbba886
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 22 16:12:57 2008 -0800

    Fix debug messages.
    Jeremy.

commit bcc5371b8e7f369e8d830d9cf687089514997248
Merge: 9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18 ce57d388251063c22f89680e9d1c2129d9879975
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 22 13:38:03 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18
Merge: beb0a76b93f9dd054dbc4192516e7008e59b27d9 a2230ccc1700af02f5a5caedd2e66e6f4c14bb5c
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 21 11:03:35 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit beb0a76b93f9dd054dbc4192516e7008e59b27d9
Merge: 3957ada4b6aa1f349ac1504125c4013512829ced 22cdd4cb507022d9c670b7d5cbc8d357b0b91637
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 21 09:53:00 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 3957ada4b6aa1f349ac1504125c4013512829ced
Merge: 847874ca757ac8ca32082305c8caed5abc7fed1d 943386c5dd601f5c8cf85bfcb08f731dd5a6437d
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 15 12:39:14 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 847874ca757ac8ca32082305c8caed5abc7fed1d
Merge: 58b0f022ffce7fda531f6f8ea7392a963e8ec0c5 2c54ef2d07ab440f1c163b666caedcb9c061543b
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 15 09:35:18 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 58b0f022ffce7fda531f6f8ea7392a963e8ec0c5
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 14 18:16:09 2008 -0800

    Fix "warning: 'cmd' may be used uninitialized in this function"
    Jeremy.

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

Summary of changes:
 source/nsswitch/libwbclient/wbc_pam.c |    3 +++
 source/smbd/open.c                    |    9 +++++----
 source/utils/net_rpc_samsync.c        |    8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index de49a6b..9b8a913 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -383,6 +383,9 @@ wbcErr wbcAuthenticateUserEx(const struct wbcAuthUserParams *params,
 			       request.data.auth_crap.nt_resp_len);
 		}
 		break;
+	default:
+		wbc_status = WBC_ERR_INVALID_PARAM;
+		BAIL_ON_WBC_ERROR(wbc_status);
 	}
 
 	if (cmd == 0) {
diff --git a/source/smbd/open.c b/source/smbd/open.c
index aa4bc48..cc78503 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2671,8 +2671,9 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 		status = split_ntfs_stream_name(talloc_tos(), fname,
 						&base, NULL);
 		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(10, ("split_ntfs_stream_name failed: %s\n",
-				   nt_errstr(status)));
+			DEBUG(10, ("create_file_unixpath: "
+				"split_ntfs_stream_name failed: %s\n",
+				nt_errstr(status)));
 			goto fail;
 		}
 
@@ -2840,7 +2841,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 		}
 	}
 
-	DEBUG(10, ("create_file: info=%d\n", info));
+	DEBUG(10, ("create_file_unixpath: info=%d\n", info));
 
 	/*
 	 * Set fsp->base_fsp late enough that we can't "goto fail" anymore. In
@@ -2867,7 +2868,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
 	return NT_STATUS_OK;
 
  fail:
-	DEBUG(10, ("create_file: %s\n", nt_errstr(status)));
+	DEBUG(10, ("create_file_unixpath: %s\n", nt_errstr(status)));
 
 	if (fsp != NULL) {
 		close_file(fsp, ERROR_CLOSE);
diff --git a/source/utils/net_rpc_samsync.c b/source/utils/net_rpc_samsync.c
index 569bbea..6287610 100644
--- a/source/utils/net_rpc_samsync.c
+++ b/source/utils/net_rpc_samsync.c
@@ -979,7 +979,11 @@ static NTSTATUS fetch_alias_mem(uint32_t rid,
 static NTSTATUS fetch_domain_info(uint32_t rid,
 				  struct netr_DELTA_DOMAIN *r)
 {
-	time_t u_max_age, u_min_age, u_logout, u_lockoutreset, u_lockouttime;
+	time_t u_max_age, u_min_age, u_logout;
+#if 0
+	/* FIXME: gd */
+	time_t u_lockoutreset, u_lockouttime;
+#endif
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	const char *domname;
 
@@ -1023,7 +1027,6 @@ static NTSTATUS fetch_domain_info(uint32_t rid,
 /* FIXME: gd */
 	if (!pdb_set_account_policy(AP_BAD_ATTEMPT_LOCKOUT, delta->account_lockout.bad_attempt_lockout))
 		return nt_status;
-#endif
 
 	if (!pdb_set_account_policy(AP_RESET_COUNT_TIME, (uint32)u_lockoutreset/60))
 		return nt_status;
@@ -1033,6 +1036,7 @@ static NTSTATUS fetch_domain_info(uint32_t rid,
 
 	if (!pdb_set_account_policy(AP_LOCK_ACCOUNT_DURATION, (uint32)u_lockouttime))
 		return nt_status;
+#endif
 
 	if (!pdb_set_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
 				    r->logon_to_chgpass))


-- 
Samba Shared Repository


More information about the samba-cvs mailing list