Changeset 860 for vendor/current/source3/rpc_server

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

Location:

vendor/current/source3/rpc_server

Files:

• netlogon/srv_netlog_nt.c (modified) (1 diff)
• samr/srv_samr_chgpasswd.c (modified) (4 diffs)
• samr/srv_samr_nt.c (modified) (2 diffs)
• spoolss/srv_spoolss_nt.c (modified) (12 diffs)
• wkssvc/srv_wkssvc_nt.c (modified) (2 diffs)

vendor/current/source3/rpc_server/netlogon/srv_netlog_nt.c

@@ -587 +587 @@
                 goto out;
         }
-        if (rids.count != types.count) {
+        if (types.count != 1) {
                 status = NT_STATUS_INVALID_PARAMETER;
                 goto out;

vendor/current/source3/rpc_server/samr/srv_samr_chgpasswd.c

@@ -74 +74 @@
 
 #if defined(HAVE_GRANTPT)
+#if defined(HAVE_POSIX_OPENPT)
+        master = posix_openpt(O_RDWR|O_NOCTTY);
+#else
         /* Try to open /dev/ptmx. If that fails, fall through to old method. */
-        if ((master = sys_open("/dev/ptmx", O_RDWR, 0)) >= 0) {
+        master = sys_open("/dev/ptmx", O_RDWR, 0);
+#endif
+        if (master >= 0) {
                 grantpt(master);
                 unlockpt(master);
@@ -1102 +1107 @@
         NTSTATUS nt_status;
         bool ret = false;
+        bool updated_badpw = false;
+        NTSTATUS update_login_attempts_status;
 
         if (!(sampass = samu_new(NULL))) {
@@ -1115 +1122 @@
                 TALLOC_FREE(sampass);
                 return NT_STATUS_NO_SUCH_USER;
+        }
+
+        /* Quit if the account was locked out. */
+        if (pdb_get_acct_ctrl(sampass) & ACB_AUTOLOCK) {
+                DEBUG(3,("check_sam_security: Account for user %s was locked out.\n", user));
+                TALLOC_FREE(sampass);
+                return NT_STATUS_ACCOUNT_LOCKED_OUT;
         }
 
@@ -1125 +1139 @@
                                        &new_passwd);
 
+        /*
+         * Notify passdb backend of login success/failure. If not
+         * NT_STATUS_OK the backend doesn't like the login
+         */
+        update_login_attempts_status = pdb_update_login_attempts(sampass,
+                                                NT_STATUS_IS_OK(nt_status));
+
+        if (!NT_STATUS_IS_OK(nt_status)) {
+                bool increment_bad_pw_count = false;
+
+                if (NT_STATUS_EQUAL(nt_status, NT_STATUS_WRONG_PASSWORD) &&
+                    (pdb_get_acct_ctrl(sampass) & ACB_NORMAL) &&
+                    NT_STATUS_IS_OK(update_login_attempts_status))
+                {
+                        increment_bad_pw_count = true;
+                }
+
+                if (increment_bad_pw_count) {
+                        pdb_increment_bad_password_count(sampass);
+                        updated_badpw = true;
+                } else {
+                        pdb_update_bad_password_count(sampass,
+                                                      &updated_badpw);
+                }
+        } else {
+
+                if ((pdb_get_acct_ctrl(sampass) & ACB_NORMAL) &&
+                    (pdb_get_bad_password_count(sampass) > 0)){
+                        pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
+                        pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
+                        updated_badpw = true;
+                }
+        }
+
+        if (updated_badpw) {
+                NTSTATUS update_status;
+                become_root();
+                update_status = pdb_update_sam_account(sampass);
+                unbecome_root();
+
+                if (!NT_STATUS_IS_OK(update_status)) {
+                        DEBUG(1, ("Failed to modify entry: %s\n",
+                                  nt_errstr(update_status)));
+                }
+        }
+
         if (!NT_STATUS_IS_OK(nt_status)) {
                 TALLOC_FREE(sampass);

vendor/current/source3/rpc_server/samr/srv_samr_nt.c

@@ -1707 +1707 @@
 
 /****************************************************************
- _samr_ChangePasswordUser
+ _samr_ChangePasswordUser.
+
+ So old it is just not worth implementing
+ because it does not supply a plaintext and so we can't do password
+ complexity checking and cannot update other services that use a
+ plaintext password via passwd chat/pam password change/ldap password
+ sync.
 ****************************************************************/
 
@@ -1713 +1719 @@
                                   struct samr_ChangePasswordUser *r)
 {
-        NTSTATUS status;
-        bool ret = false;
-        struct samr_user_info *uinfo;
-        struct samu *pwd;
-        struct samr_Password new_lmPwdHash, new_ntPwdHash, checkHash;
-        struct samr_Password lm_pwd, nt_pwd;
-
-        uinfo = policy_handle_find(p, r->in.user_handle,
-                                   SAMR_USER_ACCESS_SET_PASSWORD, NULL,
-                                   struct samr_user_info, &status);
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
-        DEBUG(5,("_samr_ChangePasswordUser: sid:%s\n",
-                  sid_string_dbg(&uinfo->sid)));
-
-        if (!(pwd = samu_new(NULL))) {
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        become_root();
-        ret = pdb_getsampwsid(pwd, &uinfo->sid);
-        unbecome_root();
-
-        if (!ret) {
-                TALLOC_FREE(pwd);
-                return NT_STATUS_WRONG_PASSWORD;
-        }
-
-        {
-                const uint8_t *lm_pass, *nt_pass;
-
-                lm_pass = pdb_get_lanman_passwd(pwd);
-                nt_pass = pdb_get_nt_passwd(pwd);
-
-                if (!lm_pass || !nt_pass) {
-                        status = NT_STATUS_WRONG_PASSWORD;
-                        goto out;
-                }
-
-                memcpy(&lm_pwd.hash, lm_pass, sizeof(lm_pwd.hash));
-                memcpy(&nt_pwd.hash, nt_pass, sizeof(nt_pwd.hash));
-        }
-
-        /* basic sanity checking on parameters.  Do this before any database ops */
-        if (!r->in.lm_present || !r->in.nt_present ||
-            !r->in.old_lm_crypted || !r->in.new_lm_crypted ||
-            !r->in.old_nt_crypted || !r->in.new_nt_crypted) {
-                /* we should really handle a change with lm not
-                   present */
-                status = NT_STATUS_INVALID_PARAMETER_MIX;
-                goto out;
-        }
-
-        /* decrypt and check the new lm hash */
-        D_P16(lm_pwd.hash, r->in.new_lm_crypted->hash, new_lmPwdHash.hash);
-        D_P16(new_lmPwdHash.hash, r->in.old_lm_crypted->hash, checkHash.hash);
-        if (memcmp(checkHash.hash, lm_pwd.hash, 16) != 0) {
-                status = NT_STATUS_WRONG_PASSWORD;
-                goto out;
-        }
-
-        /* decrypt and check the new nt hash */
-        D_P16(nt_pwd.hash, r->in.new_nt_crypted->hash, new_ntPwdHash.hash);
-        D_P16(new_ntPwdHash.hash, r->in.old_nt_crypted->hash, checkHash.hash);
-        if (memcmp(checkHash.hash, nt_pwd.hash, 16) != 0) {
-                status = NT_STATUS_WRONG_PASSWORD;
-                goto out;
-        }
-
-        /* The NT Cross is not required by Win2k3 R2, but if present
-           check the nt cross hash */
-        if (r->in.cross1_present && r->in.nt_cross) {
-                D_P16(lm_pwd.hash, r->in.nt_cross->hash, checkHash.hash);
-                if (memcmp(checkHash.hash, new_ntPwdHash.hash, 16) != 0) {
-                        status = NT_STATUS_WRONG_PASSWORD;
-                        goto out;
-                }
-        }
-
-        /* The LM Cross is not required by Win2k3 R2, but if present
-           check the lm cross hash */
-        if (r->in.cross2_present && r->in.lm_cross) {
-                D_P16(nt_pwd.hash, r->in.lm_cross->hash, checkHash.hash);
-                if (memcmp(checkHash.hash, new_lmPwdHash.hash, 16) != 0) {
-                        status = NT_STATUS_WRONG_PASSWORD;
-                        goto out;
-                }
-        }
-
-        if (!pdb_set_nt_passwd(pwd, new_ntPwdHash.hash, PDB_CHANGED) ||
-            !pdb_set_lanman_passwd(pwd, new_lmPwdHash.hash, PDB_CHANGED)) {
-                status = NT_STATUS_ACCESS_DENIED;
-                goto out;
-        }
-
-        status = pdb_update_sam_account(pwd);
- out:
-        TALLOC_FREE(pwd);
-
-        return status;
+        return NT_STATUS_NOT_IMPLEMENTED;
 }
 

vendor/current/source3/rpc_server/spoolss/srv_spoolss_nt.c

@@ -1745 +1745 @@
         result = open_printer_hnd(p, r->out.handle, r->in.printername, 0);
         if (!W_ERROR_IS_OK(result)) {
-                DEBUG(0,("_spoolss_OpenPrinterEx: Cannot open a printer handle "
+                DEBUG(3,("_spoolss_OpenPrinterEx: Cannot open a printer handle "
                         "for printer %s\n", r->in.printername));
                 ZERO_STRUCTP(r->out.handle);
@@ -1943 +1943 @@
          */
 
-         if ((Printer->printer_type != SPLHND_SERVER) &&
-             r->in.devmode_ctr.devmode) {
+         if ((Printer->printer_type != SPLHND_SERVER)
+          && (r->in.devmode_ctr.devmode != NULL)) {
                 copy_devicemode(NULL, r->in.devmode_ctr.devmode,
                                 &Printer->devmode);
          }
-
-#if 0   /* JERRY -- I'm doubtful this is really effective */
-        /* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN
-           optimization in Windows 2000 clients  --jerry */
-
-        if ( (r->in.access_mask == PRINTER_ACCESS_ADMINISTER)
-                && (RA_WIN2K == get_remote_arch()) )
-        {
-                DEBUG(10,("_spoolss_OpenPrinterEx: Enabling LAN/WAN hack for Win2k clients.\n"));
-                sys_usleep( 500000 );
-        }
-#endif
 
         return WERR_OK;
@@ -4038 +4026 @@
         r->averageppm           = info2->averageppm;
 
-        copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-        if (!r->devmode) {
+        if (info2->devmode != NULL) {
+                result = copy_devicemode(mem_ctx,
+                                         info2->devmode,
+                                         &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else if (lp_default_devmode(snum)) {
+                result = spoolss_create_default_devmode(mem_ctx,
+                                                        info2->printername,
+                                                        &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else {
+                r->devmode = NULL;
                 DEBUG(8,("Returning NULL Devicemode!\n"));
         }
@@ -4175 +4177 @@
 {
         struct auth_serversupplied_info *session_info;
-        struct GUID guid;
+        char *printer;
         NTSTATUS status;
-
-        status = make_session_info_system(mem_ctx, &session_info);
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOMEM;
+        }
+
+        status = make_session_info_system(tmp_ctx, &session_info);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0, ("construct_printer_info7: "
                           "Could not create system session_info\n"));
-                return WERR_NOMEM;
-        }
-
-        if (is_printer_published(mem_ctx, session_info, msg_ctx,
-                                 servername,
-                                 lp_servicename(snum), &guid, NULL)) {
+                werr = WERR_NOMEM;
+                goto out_tmp_free;
+        }
+
+        printer = lp_servicename(snum);
+        if (printer == NULL) {
+                DEBUG(0, ("invalid printer snum %d\n", snum));
+                werr = WERR_INVALID_PARAM;
+                goto out_tmp_free;
+        }
+
+        if (is_printer_published(tmp_ctx, session_info, msg_ctx,
+                                 servername, printer, NULL)) {
+                struct GUID guid;
+                werr = nt_printer_guid_get(tmp_ctx, session_info, msg_ctx,
+                                           printer, &guid);
+                if (!W_ERROR_IS_OK(werr)) {
+                        goto out_tmp_free;
+                }
                 r->guid = talloc_strdup_upper(mem_ctx, GUID_string2(mem_ctx, &guid));
                 r->action = DSPRINT_PUBLISH;
@@ -4194 +4214 @@
                 r->action = DSPRINT_UNPUBLISH;
         }
-        W_ERROR_HAVE_NO_MEMORY(r->guid);
-
-        TALLOC_FREE(session_info);
-        return WERR_OK;
+        if (r->guid == NULL) {
+                werr = WERR_NOMEM;
+                goto out_tmp_free;
+        }
+
+        werr = WERR_OK;
+out_tmp_free:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -4219 +4244 @@
         }
 
-        copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-        if (!r->devmode) {
+        if (info2->devmode != NULL) {
+                result = copy_devicemode(mem_ctx,
+                                         info2->devmode,
+                                         &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else if (lp_default_devmode(snum)) {
+                result = spoolss_create_default_devmode(mem_ctx,
+                                                        info2->printername,
+                                                        &r->devmode);
+                if (!W_ERROR_IS_OK(result)) {
+                        return result;
+                }
+        } else {
+                r->devmode = NULL;
                 DEBUG(8,("Returning NULL Devicemode!\n"));
         }
@@ -4427 +4466 @@
         DEBUG(4,("enum_all_printers_info_1_name\n"));
 
-        if ((servername[0] == '\\') && (servername[1] == '\\')) {
+        if (servername != NULL &&
+            (servername[0] == '\\') && (servername[1] == '\\')) {
                 s = servername + 2;
         }
@@ -4462 +4502 @@
            WERR_CAN_NOT_COMPLETE so we should do the same. */
 
-        if (servername[0] == '\\' && servername[1] == '\\') {
+        if (servername != NULL &&
+            (servername[0] == '\\') && (servername[1] == '\\')) {
                  s = servername + 2;
         }
@@ -5592 +5633 @@
         struct printer_handle *printer;
         WERROR result;
+        uint32_t version = r->in.client_major_version;
 
         int snum;
@@ -5614 +5656 @@
         if (!get_printer_snum(p, r->in.handle, &snum, NULL)) {
                 return WERR_BADFID;
+        }
+
+        if (r->in.client_major_version == SPOOLSS_DRIVER_VERSION_2012) {
+                DEBUG(3,("_spoolss_GetPrinterDriver2: v4 driver requested, "
+                        "downgrading to v3\n"));
+                version = SPOOLSS_DRIVER_VERSION_200X;
         }
 
@@ -5622 +5670 @@
                                                      snum, printer->servername,
                                                      r->in.architecture,
-                                                     r->in.client_major_version);
+                                                     version);
         if (!W_ERROR_IS_OK(result)) {
                 TALLOC_FREE(r->out.info);
@@ -5722 +5770 @@
 
         if (info_1->datatype) {
-                if (strcmp(info_1->datatype, "RAW") != 0) {
+                /*
+                 * The v4 driver model used in Windows 8 declares print jobs
+                 * intended to bypass the XPS processing layer by setting
+                 * datatype to "XPS_PASS" instead of "RAW".
+                 */
+                if ((strcmp(info_1->datatype, "RAW") != 0)
+                 && (strcmp(info_1->datatype, "XPS_PASS") != 0)) {
                         *r->out.job_id = 0;
                         return WERR_INVALID_DATATYPE;

vendor/current/source3/rpc_server/wkssvc/srv_wkssvc_nt.c

@@ -580 +580 @@
                 r->out.info->level = r->in.info->level;
                 *r->out.entries_read = r->out.info->ctr.user0->entries_read;
-                *r->out.resume_handle = 0;
+                if (r->out.resume_handle != NULL) {
+                        *r->out.resume_handle = 0;
+                }
                 break;
         case 1:
@@ -589 +591 @@
                 r->out.info->level = r->in.info->level;
                 *r->out.entries_read = r->out.info->ctr.user1->entries_read;
-                *r->out.resume_handle = 0;
+                if (r->out.resume_handle != NULL) {
+                        *r->out.resume_handle = 0;
+                }
                 break;
         default: