Changeset 401 for branches/client-1.6/src/ndpsmb.c

Timestamp:

Jan 29, 2010, 1:51:25 PM (16 years ago)

Author:

Silvan Scherrer

Message:

added all remaining changes from 1.5.0 client

File:

• branches/client-1.6/src/ndpsmb.c (modified) (4 diffs)

branches/client-1.6/src/ndpsmb.c

@@ -207 +207 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        { ND_PROP_ULONG, 0, "MEMLEN", "2"},
-        {ND_PROP_STRING, 0, "LOGFILE", ""},
-        { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
@@ -389 +386 @@
 
         pRes->rootlevel = 0;
-        *pRes->logfile = 0;
-        pRes->loglevel = 0;
         pRes->easupport = 1;
 #ifdef HAVE_KRB5_H
@@ -474 +469 @@
         }
 
-        t = 0, q = NULL;
-        rc = ph->fsphQueryStringProperty (properties, "LOGFILE", &q, &t);
-        if (!rc && t && *q)
-        {
-                StrNCpy(pRes->logfile, q, sizeof(pRes->logfile) - 1);
-        }
-
-        t = 0;
-        rc = ph->fsphQueryUlongProperty (properties, "LOGLEVEL", &t);
-        if (!rc)
-        {
-                if (t > 9)
-                {
-                        t = 9;
-                        rc = ERROR_INVALID_PARAMETER;
-                }
-                pRes->loglevel = t;
-        }
-
         t = 0;
         rc = ph->fsphQueryUlongProperty (properties, "MASTERTYPE", &t);
@@ -520 +496 @@
                 }
         }
-
-#if 0
-        t = 0;
-        rc = ph->fsphQueryUlongProperty (properties, "MEMLEN", &t);
-        if (!rc)
-        {
-                if (t <= (pRes->easupport ? 1 : 0) || t > 10)
-                {
-                        rc = ERROR_INVALID_PARAMETER;
-                }
-                else
-                {
-                        pRes->memlen = t * 65536;
-                }
-        }
-#endif
 
         return rc;