Print this page
NEX-18708 Domain logons may get STATUS_ACCESS_DENIED
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
1575 untangle libmlrpc from SMB server
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
NEX-15558 SMB logon fails during 1st second after service start
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-15558 SMB logon fails during 1st second after service start
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-9106 SMB should support "Resource SID Compression"
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
NEX-4272 Allow authenticating computer accounts
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
NEX-3080 SMB1 signing problem with Kerberos auth.
Reviewed by: Bayard Bell <bayard.bell@nexenta.com>
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Matt Barden <Matt.Barden@nexenta.com>
NEX-2225 Unable to join NexentaStor to 2008 AD
NEX-1810 extended security Kerberos (inbound)
re #7126 rb4153 smbd panic with missing negotiate challenge

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/smbsrv/libmlsvc/common/netr_logon.c
          +++ new/usr/src/lib/smbsrv/libmlsvc/common/netr_logon.c
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  24      - * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
       24 + * Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
  25   25   */
  26   26  
  27   27  /*
  28   28   * NETR SamLogon and SamLogoff RPC client functions.
  29   29   */
  30   30  
  31   31  #include <stdio.h>
  32   32  #include <strings.h>
  33   33  #include <stdlib.h>
  34   34  #include <time.h>
  35   35  #include <alloca.h>
  36   36  #include <unistd.h>
  37   37  #include <netdb.h>
  38   38  #include <thread.h>
  39   39  
       40 +#include <libmlrpc/libmlrpc.h>
  40   41  #include <smbsrv/libsmb.h>
  41      -#include <smbsrv/libmlrpc.h>
  42   42  #include <smbsrv/libmlsvc.h>
  43   43  #include <smbsrv/ndl/netlogon.ndl>
  44   44  #include <smbsrv/netrauth.h>
  45   45  #include <smbsrv/smbinfo.h>
  46   46  #include <smbsrv/smb_token.h>
  47   47  #include <mlsvc.h>
  48   48  
  49      -#define NETLOGON_ATTEMPTS       2
  50      -
  51      -static uint32_t netlogon_logon(smb_logon_t *, smb_token_t *);
       49 +static uint32_t netlogon_logon(smb_logon_t *, smb_token_t *, smb_domainex_t *);
  52   50  static uint32_t netr_server_samlogon(mlsvc_handle_t *, netr_info_t *, char *,
  53   51      smb_logon_t *, smb_token_t *);
  54   52  static void netr_invalidate_chain(void);
  55   53  static void netr_interactive_samlogon(netr_info_t *, smb_logon_t *,
  56   54      struct netr_logon_info1 *);
  57   55  static void netr_network_samlogon(ndr_heap_t *, netr_info_t *,
  58   56      smb_logon_t *, struct netr_logon_info2 *);
  59   57  static void netr_setup_identity(ndr_heap_t *, smb_logon_t *,
  60   58      netr_logon_id_t *);
  61   59  static boolean_t netr_isadmin(struct netr_validation_info3 *);
  62   60  static uint32_t netr_setup_domain_groups(struct netr_validation_info3 *,
  63   61      smb_ids_t *);
  64      -static uint32_t netr_setup_token_info3(struct netr_validation_info3 *,
  65      -    smb_token_t *);
       62 +static uint32_t netr_setup_krb5res_groups(struct krb5_validation_info *,
       63 +    smb_ids_t *);
  66   64  static uint32_t netr_setup_token_wingrps(struct netr_validation_info3 *,
  67   65      smb_token_t *);
  68   66  
  69   67  /*
  70   68   * Shared with netr_auth.c
  71   69   */
  72   70  extern netr_info_t netr_global_info;
  73   71  
  74   72  static mutex_t netlogon_mutex;
  75   73  static cond_t netlogon_cv;
↓ open down ↓ 1 lines elided ↑ open up ↑
  77   75  static boolean_t netlogon_abort = B_FALSE;
  78   76  
  79   77  /*
  80   78   * Helper for Kerberos authentication
  81   79   */
  82   80  uint32_t
  83   81  smb_decode_krb5_pac(smb_token_t *token, char *data, uint_t len)
  84   82  {
  85   83          struct krb5_validation_info info;
  86   84          ndr_buf_t *nbuf;
       85 +        smb_sid_t *domsid;
  87   86          uint32_t status = NT_STATUS_NO_MEMORY;
  88   87          int rc;
  89   88  
  90   89          bzero(&info, sizeof (info));
  91   90  
  92   91          /* Need to keep this until we're done with &info */
  93   92          nbuf = ndr_buf_init(&TYPEINFO(netr_interface));
  94   93          if (nbuf == NULL)
  95   94                  goto out;
  96   95  
  97   96          rc = ndr_buf_decode(nbuf, NDR_PTYPE_PAC,
  98   97              NETR_OPNUM_decode_krb5_pac, data, len, &info);
  99   98          if (rc != NDR_DRC_OK) {
 100   99                  status = RPC_NT_PROTOCOL_ERROR;
 101  100                  goto out;
 102  101          }
 103  102  
 104      -        status = netr_setup_token_info3(&info.info3, token);
      103 +        /*
      104 +         * Copy the decoded info into the token,
      105 +         * similar to netr_setup_token()
      106 +         */
      107 +        domsid = (smb_sid_t *)info.info3.LogonDomainId;
 105  108  
 106      -        /* Deal with the "resource groups"? */
 107      -
 108      -
 109      -out:
 110      -        if (nbuf != NULL)
 111      -                ndr_buf_fini(nbuf);
 112      -
 113      -        return (status);
 114      -}
 115      -
 116      -/*
 117      - * Code factored out of netr_setup_token()
 118      - */
 119      -static uint32_t
 120      -netr_setup_token_info3(struct netr_validation_info3 *info3,
 121      -    smb_token_t *token)
 122      -{
 123      -        smb_sid_t *domsid;
 124      -
 125      -        domsid = (smb_sid_t *)info3->LogonDomainId;
 126      -
 127  109          token->tkn_user.i_sid = smb_sid_splice(domsid,
 128      -            info3->UserId);
      110 +            info.info3.UserId);
 129  111          if (token->tkn_user.i_sid == NULL)
 130      -                goto errout;
      112 +                goto out;
 131  113  
 132  114          token->tkn_primary_grp.i_sid = smb_sid_splice(domsid,
 133      -            info3->PrimaryGroupId);
      115 +            info.info3.PrimaryGroupId);
 134  116          if (token->tkn_primary_grp.i_sid == NULL)
 135      -                goto errout;
      117 +                goto out;
 136  118  
 137      -        if (info3->EffectiveName.str) {
      119 +        if (info.info3.EffectiveName.str) {
 138  120                  token->tkn_account_name =
 139      -                    strdup((char *)info3->EffectiveName.str);
      121 +                    strdup((char *)info.info3.EffectiveName.str);
 140  122                  if (token->tkn_account_name == NULL)
 141      -                        goto errout;
      123 +                        goto out;
 142  124          }
 143  125  
 144      -        if (info3->LogonDomainName.str) {
      126 +        if (info.info3.LogonDomainName.str) {
 145  127                  token->tkn_domain_name =
 146      -                    strdup((char *)info3->LogonDomainName.str);
      128 +                    strdup((char *)info.info3.LogonDomainName.str);
 147  129                  if (token->tkn_domain_name == NULL)
 148      -                        goto errout;
      130 +                        goto out;
 149  131          }
 150  132  
 151      -        return (netr_setup_token_wingrps(info3, token));
 152      -errout:
 153      -        return (NT_STATUS_INSUFF_SERVER_RESOURCES);
      133 +        status = netr_setup_domain_groups(&info.info3, &token->tkn_win_grps);
      134 +        if (status != NT_STATUS_SUCCESS)
      135 +                goto out;
      136 +
      137 +        if (info.rg_rid_cnt != 0) {
      138 +                status = netr_setup_krb5res_groups(&info, &token->tkn_win_grps);
      139 +                if (status != NT_STATUS_SUCCESS)
      140 +                        goto out;
      141 +        }
      142 +
      143 +        status = netr_setup_token_wingrps(&info.info3, token);
      144 +
      145 +out:
      146 +        if (nbuf != NULL)
      147 +                ndr_buf_fini(nbuf);
      148 +
      149 +        return (status);
 154  150  }
 155  151  
 156  152  /*
 157  153   * Abort impending domain logon requests.
 158  154   */
 159  155  void
 160  156  smb_logon_abort(void)
 161  157  {
 162  158          (void) mutex_lock(&netlogon_mutex);
 163  159          if (netlogon_busy && !netlogon_abort)
↓ open down ↓ 5 lines elided ↑ open up ↑
 169  165  
 170  166  /*
 171  167   * This is the entry point for authenticating domain users.
 172  168   *
 173  169   * If we are not going to attempt to authenticate the user,
 174  170   * this function must return without updating the status.
 175  171   *
 176  172   * If the user is successfully authenticated, we build an
 177  173   * access token and the status will be NT_STATUS_SUCCESS.
 178  174   * Otherwise, the token contents are invalid.
      175 + *
      176 + * This will retry a few times for errors indicating that the
      177 + * current DC might have gone off-line or become too busy etc.
      178 + * With such errors, smb_ddiscover_bad_dc is called and then
      179 + * the smb_domain_getinfo call here waits for new DC info.
 179  180   */
      181 +int smb_netr_logon_retries = 3;
 180  182  void
 181  183  smb_logon_domain(smb_logon_t *user_info, smb_token_t *token)
 182  184  {
      185 +        smb_domainex_t  di;
 183  186          uint32_t        status;
 184      -        int             i;
      187 +        int             retries = smb_netr_logon_retries;
 185  188  
 186  189          if (user_info->lg_secmode != SMB_SECMODE_DOMAIN)
 187  190                  return;
 188  191  
 189  192          if (user_info->lg_domain_type == SMB_DOMAIN_LOCAL)
 190  193                  return;
 191  194  
 192      -        for (i = 0; i < NETLOGON_ATTEMPTS; ++i) {
      195 +        while (--retries > 0) {
      196 +
      197 +                if (!smb_domain_getinfo(&di)) {
      198 +                        syslog(LOG_ERR, "logon DC getinfo failed");
      199 +                        status = NT_STATUS_NO_LOGON_SERVERS;
      200 +                        goto out;
      201 +                }
      202 +
 193  203                  (void) mutex_lock(&netlogon_mutex);
 194  204                  while (netlogon_busy && !netlogon_abort)
 195  205                          (void) cond_wait(&netlogon_cv, &netlogon_mutex);
 196  206  
 197  207                  if (netlogon_abort) {
 198  208                          (void) mutex_unlock(&netlogon_mutex);
 199      -                        user_info->lg_status = NT_STATUS_REQUEST_ABORTED;
 200      -                        return;
      209 +                        status = NT_STATUS_REQUEST_ABORTED;
      210 +                        goto out;
 201  211                  }
 202  212  
 203  213                  netlogon_busy = B_TRUE;
 204  214                  (void) mutex_unlock(&netlogon_mutex);
 205  215  
 206      -                status = netlogon_logon(user_info, token);
      216 +                status = netlogon_logon(user_info, token, &di);
 207  217  
 208  218                  (void) mutex_lock(&netlogon_mutex);
 209  219                  netlogon_busy = B_FALSE;
 210  220                  if (netlogon_abort)
 211  221                          status = NT_STATUS_REQUEST_ABORTED;
 212  222                  (void) cond_signal(&netlogon_cv);
 213  223                  (void) mutex_unlock(&netlogon_mutex);
 214  224  
 215      -                if (status != NT_STATUS_CANT_ACCESS_DOMAIN_INFO)
      225 +                switch (status) {
      226 +                case NT_STATUS_BAD_NETWORK_PATH:
      227 +                case NT_STATUS_BAD_NETWORK_NAME:
      228 +                case RPC_NT_SERVER_TOO_BUSY:
      229 +                        /*
      230 +                         * May retry with a new DC, or if we're
      231 +                         * out of retries, will return...
      232 +                         */
      233 +                        status = NT_STATUS_NO_LOGON_SERVERS;
 216  234                          break;
      235 +                default:
      236 +                        goto out;
      237 +                }
 217  238          }
 218  239  
      240 +out:
 219  241          if (status != NT_STATUS_SUCCESS)
 220  242                  syslog(LOG_INFO, "logon[%s\\%s]: %s", user_info->lg_e_domain,
 221  243                      user_info->lg_e_username, xlate_nt_status(status));
 222      -
 223  244          user_info->lg_status = status;
 224  245  }
 225  246  
      247 +/*
      248 + * Run a netr_server_samlogon call, dealing with the possible need to
      249 + * re-establish the NetLogon credential chain.  If that fails, return
      250 + * NT_STATUS_DOMAIN_TRUST_INCONSISTENT indicating the machine account
      251 + * needs it's password reset (or whatever).  Other errors are from the
      252 + * netr_server_samlogon() call including the many possibilities listed
      253 + * above that function.
      254 + */
 226  255  static uint32_t
 227      -netlogon_logon(smb_logon_t *user_info, smb_token_t *token)
      256 +netlogon_logon(smb_logon_t *user_info, smb_token_t *token, smb_domainex_t *di)
 228  257  {
 229      -        char resource_domain[SMB_PI_MAX_DOMAIN];
 230  258          char server[MAXHOSTNAMELEN];
 231  259          mlsvc_handle_t netr_handle;
 232      -        smb_domainex_t di;
 233  260          uint32_t status;
 234      -        int retries = 0;
      261 +        boolean_t did_reauth = B_FALSE;
 235  262  
 236      -        (void) smb_getdomainname(resource_domain, SMB_PI_MAX_DOMAIN);
      263 +        /*
      264 +         * This netr_open call does the work to connect to the DC,
      265 +         * get the IPC share, open the named pipe, RPC bind, etc.
      266 +         */
      267 +        status = netr_open(di->d_dci.dc_name, di->d_primary.di_nbname,
      268 +            &netr_handle);
      269 +        if (status != 0) {
      270 +                syslog(LOG_ERR, "netlogon remote open failed (%s)",
      271 +                    xlate_nt_status(status));
      272 +                return (status);
      273 +        }
 237  274  
 238      -        /* Avoid interfering with DC discovery. */
 239      -        if (smb_ddiscover_wait() != 0 ||
 240      -            !smb_domain_getinfo(&di)) {
 241      -                netr_invalidate_chain();
 242      -                return (NT_STATUS_CANT_ACCESS_DOMAIN_INFO);
      275 +        if (di->d_dci.dc_name[0] != '\0' &&
      276 +            (*netr_global_info.server != '\0')) {
      277 +                (void) snprintf(server, sizeof (server),
      278 +                    "\\\\%s", di->d_dci.dc_name);
      279 +                if (strncasecmp(netr_global_info.server,
      280 +                    server, strlen(server)) != 0)
      281 +                        netr_invalidate_chain();
 243  282          }
 244  283  
 245      -        do {
 246      -                if (netr_open(di.d_dci.dc_name, di.d_primary.di_nbname,
 247      -                    &netr_handle) != 0)
 248      -                        return (NT_STATUS_OPEN_FAILED);
      284 +reauth:
      285 +        if ((netr_global_info.flags & NETR_FLG_VALID) == 0 ||
      286 +            !smb_match_netlogon_seqnum()) {
      287 +                /*
      288 +                 * This does netr_server_req_challenge() and
      289 +                 * netr_server_authenticate2(), updating the
      290 +                 * current netlogon sequence number.
      291 +                 */
      292 +                status = netlogon_auth(di->d_dci.dc_name, &netr_handle,
      293 +                    NETR_FLG_NULL);
 249  294  
 250      -                if (di.d_dci.dc_name[0] != '\0' &&
 251      -                    (*netr_global_info.server != '\0')) {
 252      -                        (void) snprintf(server, sizeof (server),
 253      -                            "\\\\%s", di.d_dci.dc_name);
 254      -                        if (strncasecmp(netr_global_info.server,
 255      -                            server, strlen(server)) != 0)
 256      -                                netr_invalidate_chain();
      295 +                if (status != 0) {
      296 +                        syslog(LOG_ERR, "netlogon remote auth failed (%s)",
      297 +                            xlate_nt_status(status));
      298 +                        (void) netr_close(&netr_handle);
      299 +                        return (NT_STATUS_DOMAIN_TRUST_INCONSISTENT);
 257  300                  }
 258  301  
 259      -                if ((netr_global_info.flags & NETR_FLG_VALID) == 0 ||
 260      -                    !smb_match_netlogon_seqnum()) {
 261      -                        status = netlogon_auth(di.d_dci.dc_name, &netr_handle,
 262      -                            NETR_FLG_NULL);
      302 +                netr_global_info.flags |= NETR_FLG_VALID;
      303 +        }
 263  304  
 264      -                        if (status != 0) {
 265      -                                (void) netr_close(&netr_handle);
 266      -                                return (NT_STATUS_LOGON_FAILURE);
 267      -                        }
      305 +        status = netr_server_samlogon(&netr_handle,
      306 +            &netr_global_info, di->d_dci.dc_name, user_info, token);
 268  307  
 269      -                        netr_global_info.flags |= NETR_FLG_VALID;
      308 +        if (status == NT_STATUS_INSUFFICIENT_LOGON_INFO) {
      309 +                if (!did_reauth) {
      310 +                        /* Call netlogon_auth() again, just once. */
      311 +                        did_reauth = B_TRUE;
      312 +                        goto reauth;
 270  313                  }
      314 +                status = NT_STATUS_DOMAIN_TRUST_INCONSISTENT;
      315 +        }
 271  316  
 272      -                status = netr_server_samlogon(&netr_handle,
 273      -                    &netr_global_info, di.d_dci.dc_name, user_info, token);
      317 +        (void) netr_close(&netr_handle);
 274  318  
 275      -                (void) netr_close(&netr_handle);
 276      -        } while (status == NT_STATUS_INSUFFICIENT_LOGON_INFO && retries++ < 3);
      319 +        return (status);
      320 +}
 277  321  
 278      -        if (retries >= 3)
 279      -                status = NT_STATUS_LOGON_FAILURE;
      322 +/*
      323 + * Helper for mlsvc_netlogon
      324 + *
      325 + * Call netlogon_auth with appropriate locks etc.
      326 + * Serialize like smb_logon_domain does for
      327 + * netlogon_logon / netlogon_auth
      328 + */
      329 +uint32_t
      330 +smb_netlogon_check(char *server, char *domain)
      331 +{
      332 +        mlsvc_handle_t netr_handle;
      333 +        uint32_t        status;
 280  334  
      335 +        (void) mutex_lock(&netlogon_mutex);
      336 +        while (netlogon_busy)
      337 +                (void) cond_wait(&netlogon_cv, &netlogon_mutex);
      338 +
      339 +        netlogon_busy = B_TRUE;
      340 +        (void) mutex_unlock(&netlogon_mutex);
      341 +
      342 +        /*
      343 +         * This section like netlogon_logon(), but only does
      344 +         * one pass and no netr_server_samlogon call.
      345 +         */
      346 +
      347 +        status = netr_open(server, domain,
      348 +            &netr_handle);
      349 +        if (status != 0) {
      350 +                syslog(LOG_ERR, "netlogon remote open failed (%s)",
      351 +                    xlate_nt_status(status));
      352 +                goto unlock_out;
      353 +        }
      354 +
      355 +        if ((netr_global_info.flags & NETR_FLG_VALID) == 0 ||
      356 +            !smb_match_netlogon_seqnum()) {
      357 +                /*
      358 +                 * This does netr_server_req_challenge() and
      359 +                 * netr_server_authenticate2(), updating the
      360 +                 * current netlogon sequence number.
      361 +                 */
      362 +                status = netlogon_auth(server, &netr_handle,
      363 +                    NETR_FLG_NULL);
      364 +                if (status != 0) {
      365 +                        syslog(LOG_ERR, "netlogon remote auth failed (%s)",
      366 +                            xlate_nt_status(status));
      367 +                } else {
      368 +                        netr_global_info.flags |= NETR_FLG_VALID;
      369 +                }
      370 +        }
      371 +
      372 +        (void) netr_close(&netr_handle);
      373 +
      374 +unlock_out:
      375 +        (void) mutex_lock(&netlogon_mutex);
      376 +        netlogon_busy = B_FALSE;
      377 +        (void) cond_signal(&netlogon_cv);
      378 +        (void) mutex_unlock(&netlogon_mutex);
      379 +
 281  380          return (status);
 282  381  }
 283  382  
 284  383  static uint32_t
 285  384  netr_setup_token(struct netr_validation_info3 *info3, smb_logon_t *user_info,
 286  385      netr_info_t *netr_info, smb_token_t *token)
 287  386  {
 288  387          char *username, *domain;
 289  388          unsigned char rc4key[SMBAUTH_SESSION_KEY_SZ];
 290  389          smb_sid_t *domsid;
↓ open down ↓ 24 lines elided ↑ open up ↑
 315  414          }
 316  415  
 317  416          if (username)
 318  417                  token->tkn_account_name = strdup(username);
 319  418          if (domain)
 320  419                  token->tkn_domain_name = strdup(domain);
 321  420  
 322  421          if (token->tkn_account_name == NULL || token->tkn_domain_name == NULL)
 323  422                  return (NT_STATUS_NO_MEMORY);
 324  423  
      424 +        status = netr_setup_domain_groups(info3, &token->tkn_win_grps);
      425 +        if (status != NT_STATUS_SUCCESS)
      426 +                return (status);
      427 +
 325  428          status = netr_setup_token_wingrps(info3, token);
 326  429          if (status != NT_STATUS_SUCCESS)
 327  430                  return (status);
 328  431  
 329  432          /*
 330  433           * The UserSessionKey in NetrSamLogon RPC is obfuscated using the
 331  434           * session key obtained in the NETLOGON credential chain.
 332  435           * An 8 byte session key is zero extended to 16 bytes. This 16 byte
 333  436           * key is the key to the RC4 algorithm. The RC4 byte stream is
 334  437           * exclusively ored with the 16 byte UserSessionKey to recover
↓ open down ↓ 369 lines elided ↑ open up ↑
 704  807          /*
 705  808           * Some systems prefix the client workstation name with \\.
 706  809           * It doesn't seem to make any difference whether it's there
 707  810           * or not.
 708  811           */
 709  812          ndr_heap_mkvcs(heap, user_info->lg_workstation,
 710  813              (ndr_vcstr_t *)&identity->workstation);
 711  814  }
 712  815  
 713  816  /*
 714      - * Sets up domain, local and well-known group membership for the given
 715      - * token. Two assumptions have been made here:
 716      - *
 717      - *   a) token already contains a valid user SID so that group
 718      - *      memberships can be established
 719      - *
 720      - *   b) token belongs to a domain user
      817 + * Add local and well-known group membership to the given
      818 + * token.  Called after domain groups have been added.
 721  819   */
 722  820  static uint32_t
 723  821  netr_setup_token_wingrps(struct netr_validation_info3 *info3,
 724  822      smb_token_t *token)
 725  823  {
 726      -        smb_ids_t tkn_grps;
 727  824          uint32_t status;
 728  825  
 729      -        tkn_grps.i_cnt = 0;
 730      -        tkn_grps.i_ids = NULL;
 731      -
 732      -        status = netr_setup_domain_groups(info3, &tkn_grps);
 733      -        if (status != NT_STATUS_SUCCESS) {
 734      -                smb_ids_free(&tkn_grps);
      826 +        status = smb_sam_usr_groups(token->tkn_user.i_sid,
      827 +            &token->tkn_win_grps);
      828 +        if (status != NT_STATUS_SUCCESS)
 735  829                  return (status);
 736      -        }
 737  830  
 738      -        status = smb_sam_usr_groups(token->tkn_user.i_sid, &tkn_grps);
 739      -        if (status != NT_STATUS_SUCCESS) {
 740      -                smb_ids_free(&tkn_grps);
 741      -                return (status);
 742      -        }
 743      -
 744  831          if (netr_isadmin(info3))
 745  832                  token->tkn_flags |= SMB_ATF_ADMIN;
 746  833  
 747      -        status = smb_wka_token_groups(token->tkn_flags, &tkn_grps);
 748      -        if (status == NT_STATUS_SUCCESS)
 749      -                token->tkn_win_grps = tkn_grps;
 750      -        else
 751      -                smb_ids_free(&tkn_grps);
      834 +        status = smb_wka_token_groups(token->tkn_flags, &token->tkn_win_grps);
 752  835  
 753  836          return (status);
 754  837  }
 755  838  
 756  839  /*
 757  840   * Converts groups information in the returned structure by domain controller
 758  841   * (info3) to an internal representation (gids)
 759  842   */
 760  843  static uint32_t
 761  844  netr_setup_domain_groups(struct netr_validation_info3 *info3, smb_ids_t *gids)
↓ open down ↓ 41 lines elided ↑ open up ↑
 803  886                  ids->i_sid = smb_sid_dup((smb_sid_t *)info3->ExtraSids[i].sid);
 804  887                  if (ids->i_sid == NULL)
 805  888                          return (NT_STATUS_NO_MEMORY);
 806  889  
 807  890                  ids->i_attrs = info3->ExtraSids[i].attributes;
 808  891          }
 809  892  
 810  893          return (NT_STATUS_SUCCESS);
 811  894  }
 812  895  
      896 +/*
      897 + * Converts additional "resource" groups (from krb5_validation_info)
      898 + * into the internal representation (gids), appending to the list
      899 + * already put in place by netr_setup_domain_groups().
      900 + */
      901 +static uint32_t netr_setup_krb5res_groups(struct krb5_validation_info *info,
      902 +    smb_ids_t *gids)
      903 +{
      904 +        smb_sid_t *domain_sid;
      905 +        smb_id_t *ids;
      906 +        int i, total_cnt;
      907 +
      908 +        total_cnt = gids->i_cnt + info->rg_rid_cnt;
      909 +
      910 +        gids->i_ids = realloc(gids->i_ids, total_cnt * sizeof (smb_id_t));
      911 +        if (gids->i_ids == NULL)
      912 +                return (NT_STATUS_NO_MEMORY);
      913 +
      914 +        domain_sid = (smb_sid_t *)info->rg_dom_sid;
      915 +
      916 +        ids = gids->i_ids + gids->i_cnt;
      917 +        for (i = 0; i < info->rg_rid_cnt; i++, gids->i_cnt++, ids++) {
      918 +                ids->i_sid = smb_sid_splice(domain_sid, info->rg_rids[i].rid);
      919 +                if (ids->i_sid == NULL)
      920 +                        return (NT_STATUS_NO_MEMORY);
      921 +                ids->i_attrs = info->rg_rids[i].attributes;
      922 +        }
      923 +
      924 +        return (0);
      925 +}
      926 +
 813  927  /*
 814  928   * Determines if the given user is the domain Administrator or a
 815  929   * member of Domain Admins
 816  930   */
 817  931  static boolean_t
 818  932  netr_isadmin(struct netr_validation_info3 *info3)
 819  933  {
 820  934          smb_domain_t di;
 821  935          int i;
 822  936  
↓ open down ↓ 16 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX