Changeset 117

Timestamp:

02/02/08 07:32:39 (10 months ago)

Author:

psmedley

Message:

Update trunk with all ndpsmb changes in 3.0.28 branch

Location:

trunk/samba/source/ndpsmb

Files:

• ndpsmb.c (modified) (5 diffs)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc (modified) (1 diff)
• smbcd.c (modified) (5 diffs)
• smbwrp.c (modified) (18 diffs)
• smbwrp.h (modified) (1 diff)

trunk/samba/source/ndpsmb/ndpsmb.c

@@ -150 +150 @@
         {ND_PROP_STRING, 0, "USER", "guest"},
         {ND_PROP_STRING, 0, "PASSWORD", ""},
+        {ND_PROP_STRING, 0, "SPASSWORD",  ""},
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
@@ -376 +377 @@
 }
 
+static unsigned char fromhex (char c)
+{
+    if ('0' <= c && c <= '9')
+    {
+         return c - '0';
+    }
+    
+    if ('A' <= c && c <= 'F')
+    {
+         return c - 'A';
+    }
+    
+    if ('a' <= c && c <= 'f')
+    {
+         return c - 'a';
+    }
+    
+    return 0;
+}
+
+static char tohex (unsigned char b)
+{
+    b &= 0xF;
+    
+    if (b <= 9)
+    {
+        return b + '0';
+    }
+    
+    return 'A' + (b - 0xA);
+}
+
+static void decryptPassword (const char *pszCrypt, char *pszPlain)
+{
+    /* A simple "decryption", character from the hex value. */
+    const char *s = pszCrypt;
+    char *d = pszPlain;
+    
+    while (*s)
+    {
+        *d++ = (char)((fromhex (*s++) << 4) + fromhex (*s++));
+    }
+    
+    *d++ = 0;
+}
+
+static void encryptPassword (const char *pszPlain, char *pszCrypt)
+{
+    /* A simple "encryption" encode each character as hex value. */
+    const char *s = pszPlain;
+    char *d = pszCrypt;
+    
+    while (*s)
+    {
+        *d++ = tohex ((*s) >> 4);
+        *d++ = tohex (*s);
+        s++;
+    }
+    
+    *d++ = 0;
+}
 
 /* accept parameters in form
@@ -386 +448 @@
         const unsigned char * q = NULL;
         HPIPE pipe;
+        int defaultPassword = 1;
 
         pRes->memlen = 1 << 18;
@@ -429 +492 @@
         {
                 StrNCpy(pRes->srv.password, q, sizeof(pRes->srv.password) - 1);
-        }
+                defaultPassword = 0;
+        }
+
+        t = 0, q = NULL;
+        rc = ph->fsphQueryStringProperty (pRes->properties, "SPASSWORD", &q, &t);
+        if (   rc == NO_ERROR
+            && *q != '\0'
+            && defaultPassword)
+        {
+            char p[1024];
+            p[0] = 0;
+        
+            decryptPassword (q, p);
+        
+            if (*p)
+            {
+                StrNCpy(pRes->srv.password, p, sizeof(pRes->srv.password) - 1);
+        
+                /* clear the plain password */
+                ph->fsphSetProperty (pRes->properties, "PASSWORD", "");
+            }
+        }
+        else
+        {
+            char c[1024];
+            encryptPassword (pRes->srv.password, c);
+        
+            ph->fsphSetProperty (pRes->properties, "SPASSWORD", c);
+        
+            // clear the plain password
+            ph->fsphSetProperty (pRes->properties, "PASSWORD", "");
+        }
 
         t = 0, q = NULL;
@@ -2017 +2111 @@
 int APIENTRY NdpIOCTL (int type, HRESOURCE resource, char *path, int function, void *in, ULONG insize, PULONG poutlen)
 {
-        log("NdpIOCTL <%s> %d %d\n", path, function, ERROR_NOT_SUPPORTED);
-        return ERROR_NOT_SUPPORTED;
+    log("NdpIOCTL <%s> %d\n", path, function);
+
+    if (in && insize > 4096)
+    {
+        sprintf (in, "SAMBA IOCTL function = %d, parms [%s] insize = %d, *poutlen = %d", function, in, insize, *poutlen);
+        *poutlen = insize;
+        return NO_ERROR;
+    }
+
+    return ERROR_NOT_SUPPORTED;
 }
 

trunk/samba/source/ndpsmb/rc/rc.dlg

@@ -31 +31 @@
                         DT_BOTTOM 
         ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | ES_UNREADABLE
+        ENTRYFIELD      "", ENT_SPASS, 0, 0, 0, 0, ES_MARGIN | 
+                        ES_UNREADABLE | NOT WS_TABSTOP | NOT WS_VISIBLE
 
         RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, 

trunk/samba/source/ndpsmb/rc/rc.h

@@ -24 +24 @@
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022
+#define ENT_SPASS                   1023

trunk/samba/source/ndpsmb/rc/rc.rc

@@ -145 +145 @@
 RCDATA (DLG_ID + 11)
 {
+    ENT_SPASS, PARMTYPE_STRING, 1L, 255L, "spassword", "%s", ""
+}
+
+RCDATA (DLG_ID + 12)
+{
     0
 }

trunk/samba/source/ndpsmb/smbcd.c

@@ -11 +11 @@
 #include "smbwrp.h"
 #include "smbcd.h"
+#include "config.h"
 
 #define SMBCD_MAX_THREADS 250
 
 int debuglevel = 0;
+int krb5support = 0;
 HMTX logmutex = 0;
 char *logfile = NULL;
@@ -306 +308 @@
         data = req->param + req->paramlen;
 //      memset(res, 0, sizeof(*res));
+
         debuglocal(1,"Client request %d paramlen %d len %d, reconnect %d. State %08x\n",  req->request, req->paramlen, req->length, *reconnect, cli);
         if (*reconnect == 2)
         {
                 debuglocal(1,"Reconnecting to last server requested\n");
-                res->rc = smbwrp_connect(srv, _cli);
+                res->rc = smbwrp_connect(srv, _cli, krb5support);
                 if (res->rc)
                 {
@@ -343 +346 @@
                                 break;
                         }
-                        res->rc = smbwrp_connect((smbwrp_server *)req->param, _cli);
+                        res->rc = smbwrp_connect((smbwrp_server *)req->param, _cli, krb5support);
                         if (!res->rc)
                         {
@@ -756 +759 @@
         printf( "Daemon priority set to PRTYC_FOREGROUNDSERVER\n");
 #endif
-
+        debuglocal(0,"Entering main()\n");
         for (argc--, argv++; argc > 0; argc--, argv++)
         {
@@ -813 +816 @@
                 }
         }
+#ifdef HAVE_KRB5_H
+        krb5support = 1;
+#else
+        krb5support = 0;
+#endif
         if (rc)
         {

trunk/samba/source/ndpsmb/smbwrp.c

@@ -373 +373 @@
 return a connection to a server
 *******************************************************/
-int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli)
+int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli, int krb5support)
 {
         char * server = srv->server_name;
@@ -387 +387 @@
         zero_ip(&ip);
 
-        debuglocal(1,"Connecting to \\\\%s:%s@%s:%s\\%s. Master %s:%d\n", srv->username, srv->password, workgroup, server, share, srv->master, srv->ifmastergroup);
+        debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
 
         if (!*server) {
@@ -434 +434 @@
                 return 3;
         }
+
+        if (krb5support == 1){
+        debuglocal(1,"Kerberos support enabled\n");
+                c->use_kerberos = True;}
+
         if (!cli_session_request(c, &calling, &called)) {
                 cli_shutdown(c);
@@ -450 +455 @@
         }
 
-        debuglocal(4," session setuping for <%s>/<%s> %d in <%s> %08x %08x %08x\n", srv->username, srv->password, strlen(srv->password), workgroup, c->protocol, c->sec_mode, c->capabilities);
+        debuglocal(4," session setuping for <%s>/<********> in <%s> %08x %08x %08x\n", srv->username,  workgroup, c->protocol, c->sec_mode, c->capabilities);
 
         if (!NT_STATUS_IS_OK(cli_session_setup(c, srv->username, 
@@ -456 +461 @@
                                srv->password, strlen(srv->password),
                                workgroup))) {
-                debuglocal(4,"%s/%s login failed\n", srv->username, srv->password);
+                debuglocal(4,"%s/******** login failed\n", srv->username);
                 /* try an anonymous login if it failed */
                 if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 1,"", 0, workgroup))) {
@@ -465 +470 @@
         }
 
-        debuglocal(4," session setup ok. Sending tconx <%s> <%s> %d\n", share, srv->password, strlen(srv->password));
+        debuglocal(4," session setup ok. Sending tconx <%s> <********>\n", share);
 
         if (!cli_send_tconX(c, share, "?????",
@@ -1022 +1027 @@
         if (!finfo) finfo = &finfo1;
 
-//      memcpy(finfo,&def_finfo,sizeof(*finfo));
+        if (p_resume_key) {
+                *p_resume_key = 0;
+        }
+
         finfo->attr = def_finfo.mode;
         finfo->mtime = def_finfo.mtime_ts.tv_sec;
@@ -1047 +1055 @@
                         p += clistr_pull(cli, finfo->fname, p,
                                          sizeof(finfo->fname),
-                                         len+2, 
+                                         len+2,
                                          STR_TERMINATE);
                         finfo->easize = -1;
@@ -1074 +1082 @@
                         size_t namelen, slen;
                         p += 4; /* next entry offset */
-#if 0
                         if (p_resume_key) {
                                 *p_resume_key = IVAL(p,0);
                         }
-#endif
+
                         p += 4; /* fileindex */
                                 
@@ -1157 +1164 @@
         smbwrp_fileinfo finfo;
         int i;
-        char *tdl, *dirlist = NULL;
+        char *dirlist = NULL;
         int dirlist_len = 0;
         int total_received = -1;
@@ -1163 +1170 @@
         int ff_searchcount=0;
         int ff_eos=0;
-        //int ff_lastname=0;
         int ff_dir_handle=0;
         int loop_count = 0;
@@ -1176 +1182 @@
 
         /* NT uses 260, OS/2 uses 2. Both accept 1. */
-        info_level = (cli->capabilities&CAP_NT_SMBS)?260:2;
+        info_level = (cli->capabilities&CAP_NT_SMBS)?260:2; 
 
         debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
@@ -1199 +1205 @@
                         SSVAL(param,0,attribute); /* attribute */
                         SSVAL(param,2,max_matches); /* max count */
-                        //SSVAL(param,4,4+2);   /* resume required + close on end */
                         SSVAL(param,4,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END)); /* resume required + close on end */
                         SSVAL(param,6,info_level); 
@@ -1210 +1215 @@
                         SSVAL(param,0,ff_dir_handle);
                         SSVAL(param,2,max_matches); /* max count */
-                        //SIVAL(param,6,0); /* ff_resume_key */
                         SSVAL(param,4,info_level); 
                         /* For W2K servers serving out FAT filesystems we *must* set the
@@ -1218 +1222 @@
                            can miss filenames. Use last filename continue instead. JRA */
                         SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */
-                        //SSVAL(param,10,8+4+2);        /* continue + resume required + close on end */
                         p = param+12;
-                        //p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
-                        //               STR_TERMINATE);
                         if (last_name_raw_len && (last_name_raw_len < (sizeof(param)-12))) {
                                 memcpy(p, last_name_raw.data, last_name_raw_len);
@@ -1231 +1232 @@
 
                 param_len = PTR_DIFF(p, param);
+
                 if (!cli_send_trans(cli, SMBtrans2, 
                                     NULL,                   /* Name */
@@ -1266 +1268 @@
                 }
 
-
                 if (cli_is_error(cli) || !rdata || !rparam) 
                 {
@@ -1290 +1291 @@
                         ff_searchcount = SVAL(p,2);
                         ff_eos = SVAL(p,4);
-                        //ff_lastname = SVAL(p,8);
                 } else {
                         ff_searchcount = SVAL(p,0);
                         ff_eos = SVAL(p,2);
-                        //ff_lastname = SVAL(p,6);
                 }
                 debuglocal(4,"list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First);

trunk/samba/source/ndpsmb/smbwrp.h

@@ -121 +121 @@
 int _System smbwrp_getclisize(void);
 int _System smbwrp_init(void);
-int _System smbwrp_connect(smbwrp_server * srv, cli_state ** c);
+int _System smbwrp_connect(smbwrp_server * srv, cli_state ** c, int krb5support);
 void _System smbwrp_disconnect(cli_state ** cli);
 int _System smbwrp_open(cli_state * cli, smbwrp_file * file);