svn commit: samba r4274 - in branches/SAMBA_4_0/source/ntvfs/ipc: .

tridge at samba.org tridge at samba.org
Sun Dec 19 03:31:57 GMT 2004


Author: tridge
Date: 2004-12-19 03:31:57 +0000 (Sun, 19 Dec 2004)
New Revision: 4274

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

Log:
make the prototype RAP netshareenum call return something a bit more sensible.

Modified:
   branches/SAMBA_4_0/source/ntvfs/ipc/rap_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/rap_server.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/rap_server.c	2004-12-19 03:23:10 UTC (rev 4273)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/rap_server.c	2004-12-19 03:31:57 UTC (rev 4274)
@@ -28,21 +28,22 @@
 NTSTATUS rap_netshareenum(struct smbsrv_request *req,
 			  struct rap_NetShareEnum *r)
 {
+	int i;
 	r->out.status = 0;
-	r->out.available = 2;
+	r->out.available = dcesrv_common_get_count_of_shares(req, NULL);
 	r->out.info = talloc_array_p(req,
-				     union rap_shareenum_info, 2);
+				     union rap_shareenum_info, r->out.available);
 
-	strncpy(r->out.info[0].info1.name, "C$", sizeof(r->out.info[0].info1.name));
-	r->out.info[0].info1.pad = 0;
-	r->out.info[0].info1.type = 0;
-	r->out.info[0].info1.comment = talloc_strdup(req, "Bla");
+	for (i=0;i<r->out.available;i++) {
+		strncpy(r->out.info[i].info1.name, 
+			dcesrv_common_get_share_name(req, NULL, i),
+			sizeof(r->out.info[0].info1.name));
+		r->out.info[i].info1.pad = 0;
+		r->out.info[i].info1.type = dcesrv_common_get_share_type(req, NULL, i);
+		r->out.info[i].info1.comment = talloc_strdup(req, 
+							     dcesrv_common_get_share_comment(req, NULL, i));
+	}
 	
-	strncpy(r->out.info[1].info1.name, "IPC$", sizeof(r->out.info[0].info1.name));
-	r->out.info[1].info1.pad = 0;
-	r->out.info[1].info1.type = 1;
-	r->out.info[1].info1.comment = talloc_strdup(req, "Blub");
-	
 	return NT_STATUS_OK;
 }
 



More information about the samba-cvs mailing list