[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-89-gf173d26

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  f173d266912e7a597b5f2a83216673a27b17c042 (commit)
       via  b9c6ea295d61205714b8453c2cbde89b6b8219c2 (commit)
      from  d601f8a55a69221e3e7f8ada70c1fe8d03a84818 (commit)

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


- Log -----------------------------------------------------------------
commit f173d266912e7a597b5f2a83216673a27b17c042
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jun 26 19:20:51 2008 -0700

    Fix gcc warnings at -O3.
    Jeremy.
    (cherry picked from commit 096ff390a24ce971c9a207493dc1b5d9f88518b6)

commit b9c6ea295d61205714b8453c2cbde89b6b8219c2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 26 16:51:45 2008 +0200

    Fix valgrind errors in _spoolss_addprinterdriver
    
    Jerry, this was dropped as part of your SVN r15309 (037f9f83). Can you please
    check?
    
    Thanks,
    
    Volker
    (cherry picked from commit 5aa2411f0b3720b790439359a2dadb23008e936e)

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

Summary of changes:
 source/auth/auth_util.c            |    2 +-
 source/libsmb/dsgetdcname.c        |    3 ++-
 source/rpc_client/cli_pipe.c       |    4 ++--
 source/rpc_server/srv_spoolss_nt.c |   11 +++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 115a6e9..2024526 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -568,7 +568,7 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
 		 * a PDC. JRA.
 		 */
 
-		winbind_off();
+		(void)winbind_off();
 
 		DEBUG(10, ("make_server_info_sam: our machine account %s "
 			"setting supplementary group list empty and "
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 48e497b..8d75593 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -920,7 +920,8 @@ static NTSTATUS make_dc_info_from_cldap_reply(TALLOC_CTX *mem_ctx,
 					      union nbt_cldap_netlogon *r,
 					      struct netr_DsRGetDCNameInfo **info)
 {
-	const char *dc_hostname, *dc_domain_name;
+	const char *dc_hostname = NULL;
+	const char *dc_domain_name = NULL;
 	const char *dc_address = NULL;
 	const char *dc_forest = NULL;
 	uint32_t dc_address_type = 0;
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 71422cd..425eb26 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -445,8 +445,8 @@ static NTSTATUS cli_pipe_validate_rpc_response(struct rpc_pipe_client *cli, RPC_
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 
-		if (prhdr->auth_len + RPC_HDR_AUTH_LEN < prhdr->auth_len ||
-				prhdr->auth_len + RPC_HDR_AUTH_LEN < RPC_HDR_AUTH_LEN) {
+		if (prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < prhdr->auth_len ||
+				prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < (unsigned int)RPC_HDR_AUTH_LEN) {
 			/* Integer wrap attempt. */
 			return NT_STATUS_INVALID_PARAMETER;
 		}
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index a8aa339..f3129ac 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -7858,6 +7858,17 @@ WERROR _spoolss_addprinterdriver(pipes_struct *p, SPOOL_Q_ADDPRINTERDRIVER *q_u,
 		goto done;
 	}
 
+        switch(level) {
+	case 3:
+		fstrcpy(driver_name,
+			driver.info_3->name ? driver.info_3->name : "");
+		break;
+	case 6:
+		fstrcpy(driver_name,
+			driver.info_6->name ?  driver.info_6->name : "");
+		break;
+        }
+
 	/*
 	 * I think this is where he DrvUpgradePrinter() hook would be
 	 * be called in a driver's interface DLL on a Windows NT 4.0/2k


-- 
Samba Shared Repository