Changeset 110

Timestamp:

01/21/08 09:55:43 (10 months ago)

Author:

psmedley

Message:

Check in updated detection of kerberos support

Location:

branches/samba-3.0/source/ndpsmb

Files:

• ndpsmb.c (modified) (8 diffs)
• rc/rc.dlg (modified) (2 diffs)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc (modified) (1 diff)
• smbcd.c (modified) (4 diffs)
• smbwrp.c (modified) (10 diffs)

branches/samba-3.0/source/ndpsmb/ndpsmb.c

@@ -156 +156 @@
         { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
-        { ND_PROP_ULONG, 0, "KRB5SUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -209 +208 @@
         char loglevel;
         int easupport;
-        int krb5support;
 } Resource;
 
@@ -246 +244 @@
                 sd.FgBg = SSF_FGBG_BACK;
                 sd.PgmName = EXECNAME;
-                if (pRes->krb5support)
-                {
-                        StrNCat(params, " -k ", sizeof(params) - 1);
-                }
                 if (pRes->loglevel)
                 {
@@ -263 +257 @@
                         StrNCat(params, pRes->logfile, sizeof(params) - 1);
                 }
-
                 log("params <%s>\n", params);
                 sd.PgmInputs = *params ? params : NULL;
@@ -274 +267 @@
                         char failed[CCHMAXPATH + 1] = {0};
                         RESULTCODES res = {0};
-                        UCHAR pszArgString[CCHMAXPATH+41] ; /* Argument string */
-                        sprintf(pszArgString, "smbcd %s\0", params);
-                        if (params!=NULL)
-                                pszArgString[5] = '\0' ;
-                        rc = DosExecPgm(failed, sizeof(failed), EXEC_BACKGROUND, pszArgString, NULL, &res, EXECNAME);
+                        char * p = params;
+                        StrCpy(p, EXECNAME);
+                        p += StrLen(p) + 1;
+                        if (*pRes->logfile)
+                        {
+                                StrCpy(p, "-l ");
+                                StrNCat(p, pRes->logfile, sizeof(params) - (p - (char *)params));
+                                p += StrLen(p) + 1;
+                                if (pRes->loglevel)
+                                {
+                                        char level[2];
+                                        level[0] = pRes->loglevel + '0';
+                                        level[1] = 0;
+                                        StrCpy(p, "-d ");
+                                        StrNCat(p, level, sizeof(params) - (p - (char *)params));
+                                        p += StrLen(p) + 1;
+                                }
+                        }
+                        else
+                        {
+                                StrCpy(p, "-q");
+                                p += StrLen(p) + 1;
+                        }
+                        *p = 0;         
+                        rc = DosExecPgm(failed, sizeof(failed), EXEC_BACKGROUND, params, NULL, &res, EXECNAME);
                         log("smbcd DosExecPgm codeTerminate %d codeResult %d rc %d\n", res.codeTerminate, res.codeResult, rc);
                 }
-                if (!rc) 
+                if (!rc)
                 {
                         DosSleep(500);
@@ -379 +392 @@
         pRes->loglevel = 0;
         pRes->easupport = 1;
-        pRes->krb5support = 0;
 
         t = 0, q = NULL;
@@ -484 +496 @@
                 {
                         pRes->memlen = t * 65536;
-                }
-        }
-
-        t = 0;
-        rc = ph->fsphQueryUlongProperty (pRes->properties, "KRB5SUPPORT", &t);
-        if (!rc)
-        {
-                if (t > 1)
-                {
-                        rc = ERROR_INVALID_PARAMETER;
-                }
-                else
-                {
-                        pRes->krb5support = t;
                 }
         }
@@ -2019 +2017 @@
 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);
+    log("NdpIOCTL <%s> %d %d\n", path, function, ERROR_NOT_SUPPORTED);
         return ERROR_NOT_SUPPORTED;
 }

branches/samba-3.0/source/ndpsmb/rc/rc.dlg

@@ -9 +9 @@
             FCF_TITLEBAR
     BEGIN
-        CTEXT           "SMB resource properties:", LBL_PROP, 5, 129, 190, 
-                        10, DT_VCENTER
-        RTEXT           "Workgroup:", LBL_WORKGRP, 5, 117, 60, 10, DT_BOTTOM
+        CTEXT           "SMB resource properties:", LBL_PROP, 5, 129, 190, 10, 
+                        DT_VCENTER
+
+        RTEXT           "Workgroup:", LBL_WORKGRP, 5, 117, 60, 10, 
+                        DT_BOTTOM
         ENTRYFIELD      "", ENT_WORKGRP, 67, 118, 100, 8, ES_MARGIN
-        RTEXT           "Server:", LBL_SERVER, 5, 105, 60, 10, DT_BOTTOM
+
+        RTEXT           "Server:", LBL_SERVER, 5, 105, 60, 10, 
+                        DT_BOTTOM
         ENTRYFIELD      "", ENT_SERVER, 67, 106, 100, 8, ES_MARGIN
-        RTEXT           "Share:", LBL_SHARE, 5, 93, 60, 10, DT_BOTTOM
+
+        RTEXT           "Share:", LBL_SHARE, 5, 93, 60, 10, 
+                        DT_BOTTOM
         ENTRYFIELD      "", ENT_SHARE, 67, 94, 100, 8, ES_MARGIN
-        RTEXT           "User:", LBL_USER, 5, 81, 60, 10, DT_BOTTOM
+
+        RTEXT           "User:", LBL_USER, 5, 81, 60, 10, 
+                        DT_BOTTOM
         ENTRYFIELD      "", ENT_USER, 67, 82, 100, 8, ES_MARGIN
-        RTEXT           "Password:", LBL_PASS, 5, 69, 60, 10, DT_BOTTOM
-        ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | 
-                        ES_UNREADABLE
-        RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, DT_BOTTOM
+
+        RTEXT           "Password:", LBL_PASS, 5, 69, 60, 10, 
+                        DT_BOTTOM 
+        ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | ES_UNREADABLE
+
+        RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, 
+                        DT_BOTTOM
         CONTROL         "", CMB_MASTER, 37, 35, 50, 33, WC_COMBOBOX, 
                         CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | 
@@ -32 +43 @@
                         CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | 
                         WS_VISIBLE
-        RTEXT           "Logfile:", LBL_LOGFILE, 5, 33, 60, 10, DT_BOTTOM
+
+        RTEXT           "Logfile:", LBL_LOGFILE, 5, 33, 60, 10, 
+                        DT_BOTTOM
         ENTRYFIELD      "", ENT_LOGFILE, 67, 33, 100, 8, ES_MARGIN
-        RTEXT           "Loglevel:", LBL_LOGLEVEL, 5, 21, 60, 10, DT_BOTTOM
-        SPINBUTTON      CMB_LOGLEVEL, 67, 18, 20, 35, SPBS_NUMERICONLY | 
-                        SPBS_MASTER | SPBS_JUSTRIGHT | WS_GROUP
-        LTEXT           "EA Support", LBL_EASUPPORT, 107, 20, 28, 10, 
+
+        RTEXT           "Loglevel:", LBL_LOGLEVEL, 5, 21, 60, 10, 
                         DT_BOTTOM
-        AUTOCHECKBOX    "", CHK_EASUPPORT, 97, 20, 10, 10, WS_GROUP
+        CONTROL         "", CMB_LOGLEVEL, 67, 18, 20, 35, WC_SPINBUTTON, 
+                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP | 
+                        WS_VISIBLE
+
+        LTEXT           "EA Support", LBL_EASUPPORT, 121, 20, 50, 10, 
+                        DT_BOTTOM
+        CONTROL         "", CHK_EASUPPORT, 110, 20, 10, 10, WC_BUTTON, 
+                        BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | 
+                        WS_VISIBLE
+
         PUSHBUTTON      "Cancel", DID_CANCEL, 2, 2, 40, 14
         PUSHBUTTON      "<<Previous", BTN_PREV, 49, 2, 59, 14
         DEFPUSHBUTTON   "Done", DID_OK, 113, 2, 40, 14
         PUSHBUTTON      "Help", BTN_HELP, 158, 2, 40, 14, BS_HELP
-        LTEXT           "KRB5 Support", LBL_KRB5SUPPORT, 164, 19, 32, 10, 
-                        DT_BOTTOM
-        AUTOCHECKBOX    "", CHK_KRB5SUPPORT, 152, 19, 10, 10, WS_GROUP
     END
 END

branches/samba-3.0/source/ndpsmb/rc/rc.h

@@ -24 +24 @@
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022
-#define CHK_KRB5SUPPORT               1023
-#define LBL_KRB5SUPPORT             1024

branches/samba-3.0/source/ndpsmb/rc/rc.rc

@@ -142 +142 @@
     "1"
 }
-
+    
 RCDATA (DLG_ID + 11)
-{
-    CHK_KRB5SUPPORT, PARMTYPE_INT, 0L, 1L, "krb5support", "%d", 1L, 
-    "0", 
-    "1"
-}
-    
-RCDATA (DLG_ID + 12)
 {
     0

branches/samba-3.0/source/ndpsmb/smbcd.c

@@ -11 +11 @@
 #include "smbwrp.h"
 #include "smbcd.h"
+#include "config.h"
 
 #define SMBCD_MAX_THREADS 250
@@ -741 +742 @@
 void help(void)
 {
-        printf("Usage: smbcd [-d/--debug <debuglevel>] [-q/--quiet] [-l/--logfile <logfile>] [-k/--kerberos]\n");
+        printf("Usage: smbcd [-d/--debug <debuglevel>] [-q/--quiet] [-l/--logfile <logfile>]\n");
 }
 
@@ -809 +810 @@
                         quiet = 1;
                 } else
-                if (strcmp(argv[0], "-k") == 0 || strcmp(argv[0], "--kerberos") == 0)
-                {
-                        krb5support = 1;
-                } else
                 {
                         printf("Unknown parameter <%s>\n", argv[0]);
@@ -819 +816 @@
                 }
         }
+#ifdef HAVE_KRB5_H
+        krb5support = 1;
+#else
+        krb5support = 0;
+#endif
         if (rc)
         {

branches/samba-3.0/source/ndpsmb/smbwrp.c

@@ -1027 +1027 @@
         if (!finfo) finfo = &finfo1;
 
-//      memcpy(finfo,&def_finfo,sizeof(*finfo));
         finfo->attr = def_finfo.mode;
         finfo->mtime = def_finfo.mtime_ts.tv_sec;
@@ -1162 +1161 @@
         smbwrp_fileinfo finfo;
         int i;
-        char *tdl, *dirlist = NULL;
+        char *dirlist = NULL;
         int dirlist_len = 0;
         int total_received = -1;
@@ -1168 +1167 @@
         int ff_searchcount=0;
         int ff_eos=0;
-        //int ff_lastname=0;
         int ff_dir_handle=0;
         int loop_count = 0;
@@ -1181 +1179 @@
 
         /* 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);
@@ -1204 +1202 @@
                         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); 
@@ -1215 +1212 @@
                         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
@@ -1223 +1219 @@
                            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);
@@ -1236 +1229 @@
 
                 param_len = PTR_DIFF(p, param);
+
                 if (!cli_send_trans(cli, SMBtrans2, 
                                     NULL,                   /* Name */
@@ -1271 +1265 @@
                 }
 
-
                 if (cli_is_error(cli) || !rdata || !rparam) 
                 {
@@ -1295 +1288 @@
                         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);