svn commit: samba r11054 - branches/SAMBA_3_0/source/rpc_server trunk/source/rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-10-14 14:51:48 +0000 (Fri, 14 Oct 2005)
New Revision: 11054

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

Log:
patch from Brian Moran; fix error code return in _srv_net_name_validate()
Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c
   trunk/source/rpc_server/srv_srvsvc_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c	2005-10-14 14:45:28 UTC (rev 11053)
+++ branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c	2005-10-14 14:51:48 UTC (rev 11054)
@@ -2275,31 +2275,18 @@
 
 WERROR _srv_net_name_validate(pipes_struct *p, SRV_Q_NET_NAME_VALIDATE *q_u, SRV_R_NET_NAME_VALIDATE *r_u)
 {
-	int snum;
 	fstring share_name;
 
-	r_u->status=WERR_OK;
-
-	switch(q_u->type) {
-
+	switch ( q_u->type ) {
 	case 0x9:
+		/* check if share name is ok. 
+		  TODO: check for invalid characters in name? */
 
-		/*check if share name is ok*/
-		/*also check if we already have a share with this name*/
-
 		unistr2_to_ascii(share_name, &q_u->uni_name, sizeof(share_name));
-		snum = find_service(share_name);
-
-		/* Share already exists. */
-		if (snum >= 0)
-			r_u->status = WERR_ALREADY_EXISTS;
 		break;
-
 	default:
-		/*unsupported type*/
-		r_u->status = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return r_u->status;
+	return WERR_OK;
 }

Modified: trunk/source/rpc_server/srv_srvsvc_nt.c
===================================================================
--- trunk/source/rpc_server/srv_srvsvc_nt.c	2005-10-14 14:45:28 UTC (rev 11053)
+++ trunk/source/rpc_server/srv_srvsvc_nt.c	2005-10-14 14:51:48 UTC (rev 11054)
@@ -2275,31 +2275,18 @@
 
 WERROR _srv_net_name_validate(pipes_struct *p, SRV_Q_NET_NAME_VALIDATE *q_u, SRV_R_NET_NAME_VALIDATE *r_u)
 {
-	int snum;
 	fstring share_name;
 
-	r_u->status=WERR_OK;
-
-	switch(q_u->type) {
-
+	switch ( q_u->type ) {
 	case 0x9:
+		/* check if share name is ok. 
+		  TODO: check for invalid characters in name? */
 
-		/*check if share name is ok*/
-		/*also check if we already have a share with this name*/
-
 		unistr2_to_ascii(share_name, &q_u->uni_name, sizeof(share_name));
-		snum = find_service(share_name);
-
-		/* Share already exists. */
-		if (snum >= 0)
-			r_u->status = WERR_ALREADY_EXISTS;
 		break;
-
 	default:
-		/*unsupported type*/
-		r_u->status = WERR_UNKNOWN_LEVEL;
-		break;
+		return WERR_UNKNOWN_LEVEL;
 	}
 
-	return r_u->status;
+	return WERR_OK;
 }