Changeset 223 for branches/samba-3.3.x/source/services

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/services/services_db.c (modified) (5 diffs)

branches/samba-3.3.x/source/services/services_db.c

@@ -333 +333 @@
 ********************************************************************/
 
-static void add_new_svc_name( REGISTRY_KEY *key_parent, REGSUBKEY_CTR *subkeys,
+static void add_new_svc_name( REGISTRY_KEY *key_parent, struct regsubkey_ctr *subkeys,
                               const char *name )
 {
@@ -340 +340 @@
         char *path = NULL;
         REGVAL_CTR *values = NULL;
-        REGSUBKEY_CTR *svc_subkeys = NULL;
+        struct regsubkey_ctr *svc_subkeys = NULL;
         SEC_DESC *sd = NULL;
         DATA_BLOB sd_blob;
@@ -367 +367 @@
         /* add the 'Security' key */
 
-        if ( !(svc_subkeys = TALLOC_ZERO_P( key_service, REGSUBKEY_CTR )) ) {
+        wresult = regsubkey_ctr_init(key_service, &svc_subkeys);
+        if (!W_ERROR_IS_OK(wresult)) {
                 DEBUG(0,("add_new_svc_name: talloc() failed!\n"));
                 TALLOC_FREE( key_service );
@@ -445 +446 @@
         const char **service_list = lp_svcctl_list();
         int i;
-        REGSUBKEY_CTR *subkeys = NULL;
+        struct regsubkey_ctr *subkeys = NULL;
         REGISTRY_KEY *key = NULL;
         WERROR wresult;
@@ -462 +463 @@
         /* lookup the available subkeys */
 
-        if ( !(subkeys = TALLOC_ZERO_P( key, REGSUBKEY_CTR )) ) {
+        wresult = regsubkey_ctr_init(key, &subkeys);
+        if (!W_ERROR_IS_OK(wresult)) {
                 DEBUG(0,("svcctl_init_keys: talloc() failed!\n"));
                 TALLOC_FREE( key );