Changeset 478 for vendor/current/source3/rpc_server

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

Location:

vendor/current/source3/rpc_server

Files:

• srv_samr_nt.c (modified) (2 diffs)
• srv_spoolss_nt.c (modified) (3 diffs)
• srv_winreg_nt.c (modified) (5 diffs)

vendor/current/source3/rpc_server/srv_samr_nt.c

@@ -2736 +2736 @@
         struct samu *smbpass=NULL;
         bool ret;
+        const uint8_t *nt_pass = NULL;
+        const uint8_t *lm_pass = NULL;
 
         ZERO_STRUCTP(r);
@@ -2770 +2772 @@
         }
 
-        r->lm_pwd_active = true;
-        r->nt_pwd_active = true;
-        memcpy(r->lm_pwd.hash, pdb_get_lanman_passwd(smbpass), 16);
-        memcpy(r->nt_pwd.hash, pdb_get_nt_passwd(smbpass), 16);
+        lm_pass = pdb_get_lanman_passwd(smbpass);
+        if (lm_pass != NULL) {
+                memcpy(r->lm_pwd.hash, lm_pass, 16);
+                r->lm_pwd_active = true;
+        }
+
+        nt_pass = pdb_get_nt_passwd(smbpass);
+        if (nt_pass != NULL) {
+                memcpy(r->nt_pwd.hash, nt_pass, 16);
+                r->nt_pwd_active = true;
+        }
         r->password_expired = 0; /* FIXME */
 

vendor/current/source3/rpc_server/srv_spoolss_nt.c

@@ -4276 +4276 @@
                              struct spoolss_EnumPrinters *r)
 {
-        const char *name;
+        const char *name = NULL;
         WERROR result;
 
@@ -4304 +4304 @@
          */
 
-        name = talloc_strdup_upper(p->mem_ctx, r->in.server);
-        W_ERROR_HAVE_NO_MEMORY(name);
+        if (r->in.server) {
+                name = talloc_strdup_upper(p->mem_ctx, r->in.server);
+                W_ERROR_HAVE_NO_MEMORY(name);
+        }
 
         switch (r->in.level) {
@@ -7416 +7418 @@
          */
 
+        if (r->in.flags == 0) {
+                return WERR_INVALID_PARAM;
+        }
+
         if (r->in.flags != APD_COPY_NEW_FILES) {
                 return WERR_ACCESS_DENIED;

vendor/current/source3/rpc_server/srv_winreg_nt.c

@@ -231 +231 @@
                 return WERR_BADFID;
 
+        if (r->in.value_name->name == NULL) {
+                return WERR_INVALID_PARAM;
+        }
+
         if ((r->out.data_length == NULL) || (r->out.type == NULL) || (r->out.data_size == NULL)) {
                 return WERR_INVALID_PARAM;
@@ -317 +321 @@
                 *r->out.data_length = outbuf_size;
                 *r->out.data_size = outbuf_size;
-                memcpy(r->out.data, outbuf, outbuf_size);
+                if (r->out.data) {
+                        memcpy(r->out.data, outbuf, outbuf_size);
+                }
                 status = WERR_OK;
         }
@@ -953 +959 @@
 WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct winreg_NotifyChangeKeyValue *r)
 {
+        return WERR_NOT_SUPPORTED;
+}
+
+/*******************************************************************
+ _winreg_QueryMultipleValues
+ ********************************************************************/
+
+WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct winreg_QueryMultipleValues *r)
+{
         /* fill in your code here if you think this call should
            do anything */
@@ -961 +976 @@
 
 /*******************************************************************
- _winreg_QueryMultipleValues
- ********************************************************************/
-
-WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct winreg_QueryMultipleValues *r)
+ _winreg_QueryMultipleValues2
+ ********************************************************************/
+
+WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultipleValues2 *r)
 {
         /* fill in your code here if you think this call should
@@ -973 +988 @@
 }
 
-/*******************************************************************
- _winreg_QueryMultipleValues2
- ********************************************************************/
-
-WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultipleValues2 *r)
-{
-        /* fill in your code here if you think this call should
-           do anything */
-
-        p->rng_fault_state = True;
-        return WERR_NOT_SUPPORTED;
-}
-