svn commit: samba r18611 - in branches/SAMBA_4_0/source/libnet: .

gd at samba.org gd at samba.org
Mon Sep 18 10:00:19 GMT 2006


Author: gd
Date: 2006-09-18 10:00:19 +0000 (Mon, 18 Sep 2006)
New Revision: 18611

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18611

Log:
Do not return NT_STATUS_OK when libnet_Add|DelShare has failed.

Guenther

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_share.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_share.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_share.c	2006-09-18 09:58:53 UTC (rev 18610)
+++ branches/SAMBA_4_0/source/libnet/libnet_share.c	2006-09-18 10:00:19 UTC (rev 18611)
@@ -134,13 +134,19 @@
 	s.in.info.info2 	= &r->in.share;
 	s.in.server_unc		= talloc_asprintf(mem_ctx, "\\\\%s", r->in.server_name);
  
-	status = dcerpc_srvsvc_NetShareAdd(c.out.dcerpc_pipe, mem_ctx,&s);	
+	status = dcerpc_srvsvc_NetShareAdd(c.out.dcerpc_pipe, mem_ctx, &s);	
 
 	if (!NT_STATUS_IS_OK(status)) {
 		r->out.error_string = talloc_asprintf(mem_ctx,
 						      "srvsvc_NetShareAdd on server '%s' failed"
 						      ": %s",
 						      r->in.server_name, nt_errstr(status));
+	} else if (!W_ERROR_IS_OK(s.out.result)) {
+		r->out.error_string = talloc_asprintf(mem_ctx,
+						      "srvsvc_NetShareAdd on server '%s' failed"
+						      ": %s",
+						      r->in.server_name, win_errstr(s.out.result));
+		status = werror_to_ntstatus(s.out.result);
 	}
 
 	talloc_free(c.out.dcerpc_pipe);
@@ -178,6 +184,12 @@
 						      "srvsvc_NetShareDel on server '%s' failed"
 						      ": %s",
 						      r->in.server_name, nt_errstr(status));
+	} else if (!W_ERROR_IS_OK(s.out.result)) {
+		r->out.error_string = talloc_asprintf(mem_ctx,
+						      "srvsvc_NetShareDel on server '%s' failed"
+						      ": %s",
+						      r->in.server_name, win_errstr(s.out.result));
+		status = werror_to_ntstatus(s.out.result);
 	}
 
 	talloc_free(c.out.dcerpc_pipe);



More information about the samba-cvs mailing list