Changeset 204 for branches/samba-3.2.x/source/services

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/services/services_db.c (modified) (9 diffs)

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

@@ -92 +92 @@
         SEC_ACCESS mask;
         size_t i = 0;
-        SEC_DESC *sd;
-        SEC_ACL *acl;
+        SEC_DESC *sd = NULL;
+        SEC_ACL *acl = NULL;
         size_t sd_size;
 
@@ -189 +189 @@
 static bool read_init_file( const char *servicename, struct rcinit_file_information **service_info )
 {
-        struct rcinit_file_information *info;
+        struct rcinit_file_information *info = NULL;
         char *filepath = NULL;
         char str[1024];
-        XFILE *f;
-        char *p;
+        XFILE *f = NULL;
+        char *p = NULL;
 
         if ( !(info = TALLOC_ZERO_P( NULL, struct rcinit_file_information ) ) )
@@ -336 +336 @@
                               const char *name )
 {
-        REGISTRY_KEY *key_service, *key_secdesc;
+        REGISTRY_KEY *key_service = NULL, *key_secdesc = NULL;
         WERROR wresult;
         char *path = NULL;
-        REGVAL_CTR *values;
-        REGSUBKEY_CTR *svc_subkeys;
-        SEC_DESC *sd;
+        REGVAL_CTR *values = NULL;
+        REGSUBKEY_CTR *svc_subkeys = NULL;
+        SEC_DESC *sd = NULL;
         DATA_BLOB sd_blob;
         NTSTATUS status;
@@ -445 +445 @@
         const char **service_list = lp_svcctl_list();
         int i;
-        REGSUBKEY_CTR *subkeys;
+        REGSUBKEY_CTR *subkeys = NULL;
         REGISTRY_KEY *key = NULL;
         WERROR wresult;
@@ -503 +503 @@
 SEC_DESC *svcctl_get_secdesc( TALLOC_CTX *ctx, const char *name, NT_USER_TOKEN *token )
 {
-        REGISTRY_KEY *key;
-        REGVAL_CTR *values;
-        REGISTRY_VALUE *val;
+        REGISTRY_KEY *key = NULL;
+        REGVAL_CTR *values = NULL;
+        REGISTRY_VALUE *val = NULL;
         SEC_DESC *ret_sd = NULL;
         char *path= NULL;
@@ -564 +564 @@
 bool svcctl_set_secdesc( TALLOC_CTX *ctx, const char *name, SEC_DESC *sec_desc, NT_USER_TOKEN *token )
 {
-        REGISTRY_KEY *key;
+        REGISTRY_KEY *key = NULL;
         WERROR wresult;
         char *path = NULL;
-        REGVAL_CTR *values;
+        REGVAL_CTR *values = NULL;
         prs_struct ps;
         bool ret = False;
@@ -621 +621 @@
         char *display_name = NULL;
         REGISTRY_KEY *key = NULL;
-        REGVAL_CTR *values;
-        REGISTRY_VALUE *val;
+        REGVAL_CTR *values = NULL;
+        REGISTRY_VALUE *val = NULL;
         char *path = NULL;
         WERROR wresult;
@@ -671 +671 @@
         char *description = NULL;
         REGISTRY_KEY *key = NULL;
-        REGVAL_CTR *values;
-        REGISTRY_VALUE *val;
+        REGVAL_CTR *values = NULL;
+        REGISTRY_VALUE *val = NULL;
         char *path = NULL;
         WERROR wresult;
@@ -716 +716 @@
 {
         REGISTRY_KEY *key = NULL;
-        REGVAL_CTR *values;
+        REGVAL_CTR *values = NULL;
         char *path = NULL;
         WERROR wresult;