Changeset 427 for vendor/current/source3/rpc_server/srv_winreg_nt.c

Timestamp:

Apr 9, 2010, 3:20:58 PM (16 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

File:

• vendor/current/source3/rpc_server/srv_winreg_nt.c (modified) (3 diffs)

vendor/current/source3/rpc_server/srv_winreg_nt.c

@@ -231 +231 @@
                 return WERR_BADFID;
 
-        if ((r->out.data_length == NULL) || (r->out.type == NULL)) {
+        if ((r->out.data_length == NULL) || (r->out.type == NULL)) {
                 return WERR_INVALID_PARAM;
         }
 
-        *r->out.data_length = *r->out.type = REG_NONE;
-
-        DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));
-        DEBUG(7,("_reg_info: policy key type = [%08x]\n", regkey->key->type));
+        DEBUG(7,("_winreg_QueryValue: policy key name = [%s]\n", regkey->key->name));
+        DEBUG(7,("_winreg_QueryValue: policy key type = [%08x]\n", regkey->key->type));
 
         /* Handle QueryValue calls on HKEY_PERFORMANCE_DATA */
@@ -288 +286 @@
                                         &val);
                 if (!W_ERROR_IS_OK(status)) {
+
+
+
+
                         if (r->out.data_size) {
                                 *r->out.data_size = 0;
@@ -307 +309 @@
         }
 
-        *r->out.data_length = outbuf_size;
-
-        if ( *r->in.data_size == 0 || !r->out.data ) {
+        status = WERR_BADFILE;
+
+        if (*r->in.data_size < outbuf_size) {
+                *r->out.data_size = outbuf_size;
+                status = r->in.data ? WERR_MORE_DATA : WERR_OK;
+        } else {
+                *r->out.data_length = outbuf_size;
+                *r->out.data_size = outbuf_size;
+                memcpy(r->out.data, outbuf, outbuf_size);
                 status = WERR_OK;
-        } else if ( *r->out.data_length > *r->in.data_size ) {
-                status = WERR_MORE_DATA;
-        } else {
-                memcpy( r->out.data, outbuf, *r->out.data_length );
-                status = WERR_OK;
-        }
-
-        *r->out.data_size = *r->out.data_length;
+        }
 
         if (free_prs) prs_mem_free(&prs_hkpd);