Changeset 398

Timestamp:

01/29/2010 12:01:06 (6 months ago)

Author:

herwigb

Message:

Remove LOGLEVEL token, remove comments

Location:

branches/client-1.5/src

Files:

• help/readme.txt (modified) (1 diff)
• help/readme_de.txt (modified) (1 diff)
• ndpsmb.c (modified) (4 diffs)

branches/client-1.5/src/help/readme.txt

@@ -238 +238 @@
    - Fix memory leak in EA code
    - Ticket #111
-   - Remove unused MEMLEN and LOGFILE token
+   - Remove unused MEMLEN, LOGFILE and LOGLEVEL token
      (Compatibility warning: These tokens must also be removed from older
      *.ndc *.evp and volumes.cfg files in order to restore connections

branches/client-1.5/src/help/readme_de.txt

@@ -246 +246 @@
    - Behebung eines Speicherloches im EA-Code
    - Ticket # 111 
-   - Die nicht mehr bentzten Token MEMLEN und LOGFILE wurden entfernt.
+   - Die nicht mehr bentzten Token MEMLEN, LOGFILE und LOGLEVEL wurden 
+     entfernt.
      (ACHTUNG! Kompatibilit„tswarnung: Die Token mssen auch aus alten
      *.evp, *.ndc und volumes.cfg Dateien entfernt werden, anonsten

branches/client-1.5/src/ndpsmb.c

@@ -207 +207 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-//      {ND_PROP_STRING, 0, "LOGFILE", ""},
-        { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
@@ -388 +386 @@
 
         pRes->rootlevel = 0;
-//      *pRes->logfile = 0;
-        pRes->loglevel = 0;
         pRes->easupport = 1;
 #ifdef HAVE_KRB5_H
@@ -474 +470 @@
 
         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;
@@ -519 +498 @@
                 }
         }
-
-#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;