[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  64fb72c wkssvc: Fix bug 9727, NULL pointer dereference
      from  ac66048 printing: update registry and publish in background

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


- Log -----------------------------------------------------------------
commit 64fb72ccb26b8e48c50407bc58618499ab2f5603
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 18 09:36:17 2013 +0100

    wkssvc: Fix bug 9727, NULL pointer dereference
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Mar 18 11:39:27 CET 2013 on sn-devel-104
    (cherry picked from commit 05a7a10c88be99d864eacd6f9d37a340022f01f6)

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

Summary of changes:
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
index 1764941..2d3ec1e 100644
--- a/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+++ b/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
@@ -579,7 +579,9 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p,
 		}
 		r->out.info->level = r->in.info->level;
 		*r->out.entries_read = r->out.info->ctr.user0->entries_read;
-		*r->out.resume_handle = 0;
+		if (r->out.resume_handle != NULL) {
+			*r->out.resume_handle = 0;
+		}
 		break;
 	case 1:
 		r->out.info->ctr.user1 = create_enum_users1(p->mem_ctx);
@@ -588,7 +590,9 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p,
 		}
 		r->out.info->level = r->in.info->level;
 		*r->out.entries_read = r->out.info->ctr.user1->entries_read;
-		*r->out.resume_handle = 0;
+		if (r->out.resume_handle != NULL) {
+			*r->out.resume_handle = 0;
+		}
 		break;
 	default:
 		return WERR_UNKNOWN_LEVEL;


-- 
Samba Shared Repository