Add server-side support for variable-length session keys (as used by

DES based krb5 logins).

Andrew Bartlett
(This used to be commit 240b0d178e1b4a3556207bdf2e342c70155f64ee)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 1debf90d23d3cb822d32fe74f655f6b2d4a0d66d..6cd5da4892f802f29de34cbba75035159ac569a8 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2953,13 +2953,10 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
                        break;
 
                case 24:
-                       if (p->session_key.length != 16) {
-                               /* we may have no session key at all, 
-                                  and we don't know how to do the SamOEMhash 
-                                  for length != 16 */
+                       if (!p->session_key.length) {
                                return NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       SamOEMhash(ctr->info.id24->pass, p->session_key.data, 516);
+                       SamOEMhashBlob(ctr->info.id24->pass, 516, &p->session_key);
 
                        dump_data(100, (char *)ctr->info.id24->pass, 516);
 
@@ -2977,10 +2974,10 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
                         * info level and W2K SP2 drops down to level 23... JRA.
                         */
 
-                       if (p->session_key.length != 16) {
+                       if (!p->session_key.length) {
                                return NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       SamOEMhash(ctr->info.id25->pass, p->session_key.data, 532);
+                       SamOEMhashBlob(ctr->info.id25->pass, 532, &p->session_key);
 
                        dump_data(100, (char *)ctr->info.id25->pass, 532);
 
@@ -2991,10 +2988,10 @@ NTSTATUS _samr_set_userinfo(pipes_struct *p, SAMR_Q_SET_USERINFO *q_u, SAMR_R_SE
                        return NT_STATUS_INVALID_INFO_CLASS;
 
                case 23:
-                       if (p->session_key.length != 16) {
+                       if (!p->session_key.length) {
                                return NT_STATUS_NO_USER_SESSION_KEY;
                        }
-                       SamOEMhash(ctr->info.id23->pass, p->session_key.data, 516);
+                       SamOEMhashBlob(ctr->info.id23->pass, 516, &p->session_key);
 
                        dump_data(100, (char *)ctr->info.id23->pass, 516);