[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b734265 s3-spoolss: Fix bug #8236 empty notify servername.
      from  17f6e02 Part 5 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)

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


- Log -----------------------------------------------------------------
commit b73426595cb30e822aee5d7e4079c3bc9a21f0ba
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Sep 2 17:03:43 2011 +0200

    s3-spoolss: Fix bug #8236 empty notify servername.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Sep  3 02:58:42 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/rpc_server/spoolss/srv_spoolss_nt.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index a2f8d68..0f9bfb7 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -3708,6 +3708,15 @@ static WERROR printer_notify_info(struct pipes_struct *p,
 		return WERR_BADFID;
 	}
 
+	/*
+	 * When sending a PRINTER_NOTIFY_FIELD_SERVER_NAME we should send the
+	 * correct servername.
+	 */
+	pinfo2->servername = talloc_strdup(pinfo2, Printer->servername);
+	if (pinfo2->servername == NULL) {
+		return WERR_NOMEM;
+	}
+
 	for (i=0; i<option->count; i++) {
 		option_type = option->types[i];
 


-- 
Samba Shared Repository