svn commit: samba r7624 - in branches/SAMBA_3_0/source: rpc_server services smbd

[jerry at samba.org]

Author: jerry
Date: 2005-06-16 00:46:43 +0000 (Thu, 16 Jun 2005)
New Revision: 7624

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

Log:
* removed unmatched tdb_lock_by_string() call (should fix build farm issues)
* comment out services.tdb code until I finish rewriting it


Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
   branches/SAMBA_3_0/source/services/services_db.c
   branches/SAMBA_3_0/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2005-06-15 22:48:15 UTC (rev 7623)
+++ branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2005-06-16 00:46:43 UTC (rev 7624)
@@ -445,9 +445,9 @@
 	
 	num_int_services = 0;
 
-	num_int_services = num_internal_services();
+	/* num_int_services = num_internal_services(); */
 
-	num_ext_services =  num_external_services();
+	/* num_ext_services =  num_external_services(); */
 
 	if ( !(services = TALLOC_ARRAY(p->mem_ctx, ENUM_SERVICES_STATUS, num_int_services+num_ext_services )) )
           return WERR_NOMEM;
@@ -458,7 +458,7 @@
 		DEBUG(8,("_svcctl_enum_services_status: Got %d internal services\n", num_int_services));
 	} 
 
-	ext_result=enum_external_services(p->mem_ctx, &services, num_int_services, &num_ext_services);
+	/* ext_result=enum_external_services(p->mem_ctx, &services, num_int_services, &num_ext_services); */
 
 	if (W_ERROR_IS_OK(ext_result)) {
 		DEBUG(8,("_svcctl_enum_services_status: Got %d external services\n", num_ext_services));

Modified: branches/SAMBA_3_0/source/services/services_db.c
===================================================================
--- branches/SAMBA_3_0/source/services/services_db.c	2005-06-15 22:48:15 UTC (rev 7623)
+++ branches/SAMBA_3_0/source/services/services_db.c	2005-06-16 00:46:43 UTC (rev 7624)
@@ -21,6 +21,8 @@
 
 #include "includes.h"
 
+#if 0
+
 /* backend database routines for services.tdb */
 
 #define SERVICEDB_VERSION_V1 1 /* Will there be more? */
@@ -90,7 +92,6 @@
 		num_services = 0;
 	} else {
 		pstrcpy(keystring,"EXTERNAL_SERVICES");
-		tdb_lock_bystring(service_tdb, keystring, 0);
 		key_data = tdb_fetch_bystring(service_tdb, keystring);
 
 		if ((key_data.dptr != NULL) && (key_data.dsize != 0)) {
@@ -98,7 +99,6 @@
 			external_services_string[key_data.dsize] = 0;
 			DEBUG(8,("enum_external_services: services list is %s, size is %d\n",external_services_string,key_data.dsize));
 		}
-		tdb_unlock_bystring(service_tdb, keystring);
 	} 
 	svc_list = str_list_make(external_services_string,NULL);
  
@@ -147,14 +147,12 @@
 		DEBUG(8,("enum_external_services: service database is not open!!!\n"));
 	} else {
 		pstrcpy(keystring,"EXTERNAL_SERVICES");
-		tdb_lock_bystring(service_tdb, keystring, 0);
 		key_data = tdb_fetch_bystring(service_tdb, keystring);
 		if ((key_data.dptr != NULL) && (key_data.dsize != 0)) {
 			strncpy(external_services_string,key_data.dptr,key_data.dsize);
 			external_services_string[key_data.dsize] = 0;
 			DEBUG(8,("enum_external_services: services list is %s, size is %d\n",external_services_string,key_data.dsize));
 		}
-		tdb_unlock_bystring(service_tdb, keystring);
 	} 
 	svc_list = str_list_make(external_services_string,NULL);
  
@@ -275,7 +273,6 @@
 		num_services = 0;
 	} else {
 		pstrcpy(keystring,"INTERNAL_SERVICES");
-		tdb_lock_bystring(service_tdb, keystring, 0);
 		key_data = tdb_fetch_bystring(service_tdb, keystring);
 
 		if ((key_data.dptr != NULL) && (key_data.dsize != 0)) {
@@ -283,7 +280,6 @@
 			internal_services_string[key_data.dsize] = 0;
 			DEBUG(8,("enum_internal_services: services list is %s, size is %d\n",internal_services_string,key_data.dsize));
 		}
-		tdb_unlock_bystring(service_tdb, keystring);
 	} 
 	svc_list = str_list_make(internal_services_string,NULL);
  
@@ -473,7 +469,6 @@
 	tdb_store_bystring(stdb,keystring,string_tdb_data(si->description),TDB_REPLACE);
 
 	pstr_sprintf(keystring,"SERVICE/%s/SHORTDESC", service_name);
-	tdb_lock_bystring(stdb, keystring, 0);
 	if (si->shortdescription && *si->shortdescription) 
 		tdb_store_bystring(stdb,keystring,string_tdb_data(si->shortdescription),TDB_REPLACE);
 	else
@@ -539,10 +534,8 @@
 		svcname++;
 	}
 	pstrcpy(keystring,"EXTERNAL_SERVICES");
-        tdb_lock_bystring(service_tdb, keystring, 0);
 	DEBUG(8,("Storing external service list [%s]\n",external_service_list));
         tdb_store_bystring(service_tdb,keystring,string_tdb_data(external_service_list),TDB_REPLACE);
-        tdb_unlock_bystring(service_tdb,keystring);
 
 	/* Get the INTERNAL services */
 	
@@ -563,11 +556,9 @@
 		isd_ptr++;
 	}
 	pstrcpy(keystring,"INTERNAL_SERVICES");
-        tdb_lock_bystring(service_tdb, keystring, 0);
 	DEBUG(8,("Storing internal service list [%s]\n",internal_service_list));
         tdb_store_bystring(service_tdb,keystring,string_tdb_data(internal_service_list),TDB_REPLACE);
-        tdb_unlock_bystring(service_tdb,keystring);
 
 	return True;
 }
-
+#endif

Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2005-06-15 22:48:15 UTC (rev 7623)
+++ branches/SAMBA_3_0/source/smbd/server.c	2005-06-16 00:46:43 UTC (rev 7624)
@@ -887,8 +887,10 @@
 	if (!init_registry())
 		exit(1);
 
+#if 0
 	if (!init_svcctl_db())
                 exit(1);
+#endif
 
 	if (!print_backend_init())
 		exit(1);