[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  af2fb66 s3-spoolss: use talloc_zero in spoolss notify code
       via  f56dfb0 testparm: Add warning if the netbios name is too long
      from  e9f0852 s3: lib: util: Ensure we read a hex number as %x, not %u.

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


- Log -----------------------------------------------------------------
commit af2fb66b89f82bf46b7fcd511c2bd6ebe7f950ef
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 27 20:46:32 2015 +0200

    s3-spoolss: use talloc_zero in spoolss notify code
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu May 21 22:53:16 CEST 2015 on sn-devel-104

commit f56dfb0722ff432edb0a228766b1f53ccefcfd23
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 27 16:18:38 2015 +0200

    testparm: Add warning if the netbios name is too long
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 source3/printing/notify.c | 8 ++------
 source3/utils/testparm.c  | 5 +++++
 2 files changed, 7 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index ec5f470..930e72b 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -357,12 +357,10 @@ static void send_notify_field_values(struct tevent_context *ev,
 	if (!create_send_ctx())
 		return;
 
-	msg = talloc(send_ctx, struct spoolss_notify_msg);
+	msg = talloc_zero(send_ctx, struct spoolss_notify_msg);
 	if (!msg)
 		return;
 
-	ZERO_STRUCTP(msg);
-
 	fstrcpy(msg->printer, sharename);
 	msg->type = type;
 	msg->field = field;
@@ -388,12 +386,10 @@ static void send_notify_field_buffer(struct tevent_context *ev,
 	if (!create_send_ctx())
 		return;
 
-	msg = talloc(send_ctx, struct spoolss_notify_msg);
+	msg = talloc_zero(send_ctx, struct spoolss_notify_msg);
 	if (!msg)
 		return;
 
-	ZERO_STRUCTP(msg);
-
 	fstrcpy(msg->printer, sharename);
 	msg->type = type;
 	msg->field = field;
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 7850b43..5912d18 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -88,6 +88,11 @@ static int do_global_checks(void)
 				"must differ.\n\n");
 	}
 
+	if (strlen(lp_netbios_name()) > 15) {
+		fprintf(stderr, "WARNING: The 'netbios name' is too long "
+				"(max. 15 chars).\n\n");
+	}
+
 	if (!directory_exist_stat(lp_lock_directory(), &st)) {
 		fprintf(stderr, "ERROR: lock directory %s does not exist\n\n",
 		       lp_lock_directory());


-- 
Samba Shared Repository