CVS: caudium/server/modules/vhs vhs_system_ldap.pike,1.9.2.8,1.9.2.9

[Xavier Beaudouin <kiwi AT cvs.caudiumforge.net>]

Update of /cvs/caudium/caudium/server/modules/vhs
In directory cvs.caudiumforge.net:/tmp/cvs-serv22147

Modified Files:
      Tag: stable_1_2
        vhs_system_ldap.pike 
Log Message:
Fixes !!!


Index: vhs_system_ldap.pike
===================================================================
RCS file: /cvs/caudium/caudium/server/modules/vhs/vhs_system_ldap.pike,v
retrieving revision 1.9.2.8
retrieving revision 1.9.2.9
diff -u -r1.9.2.8 -r1.9.2.9
--- vhs_system_ldap.pike        19 Jul 2004 19:46:29 -0000      1.9.2.8
+++ vhs_system_ldap.pike        27 Jul 2004 15:01:22 -0000      1.9.2.9
@@ -34,9 +34,9 @@
 //! inherits: module
 //! inherits: caudiumlib
 //! type: MODULE_PRECACHE
-//! cvs_version: $Id: vhs_system_ldap.pike,v 1.9.2.8 2004/07/19 19:46:29 
kiwi Exp $
+//! cvs_version: $Id: vhs_system_ldap.pike,v 1.9.2.9 2004/07/27 15:01:22 
kiwi Exp $
 
-constant cvs_version = "$Id: vhs_system_ldap.pike,v 1.9.2.8 2004/07/19 
19:46:29 kiwi Exp $";
+constant cvs_version = "$Id: vhs_system_ldap.pike,v 1.9.2.9 2004/07/27 
15:01:22 kiwi Exp $";
 constant thread_safe = 1;
 
 #include <module.h>
@@ -153,8 +153,8 @@
     // We get 2 solutions 
     // 1- don't use LDAP wwwDomain value 
     // 2- use it if exist
-    if(QUERY(logwwwDomain) && res->wwwDomain) 
-      logfile = 
combine_path(caudium->QUERY(logdirprefix)+"/",res->wwwDomain);
+    if(QUERY(logwwwDomain) && stringp(res->wwwDomain[0])) 
+      logfile = 
combine_path(caudium->QUERY(logdirprefix)+"/",res->wwwDomain[0]);
     else
       logfile = combine_path(caudium->QUERY(logdirprefix)+"/",hostname);
   }
@@ -200,12 +200,12 @@
 #ifdef THREADS
   destruct(key);
 #endif
-
-  if (res)
+ 
+  if (res->homeDirectory)
   {
      string vpath;
 
-     vpath = res->homeDirectory[0];
+     vpath = (string)res->homeDirectory[0];
 
      if (vpath[-1] != '/') vpath += "/";
 
@@ -438,7 +438,7 @@
   defvar("log2vhs", 1, "Logs using VHS parameters", TYPE_FLAG,
          "Disable it to log to system wide configurated directory");
 
-  defvar("logwwDomain", 0, "Logs using wwwDomain parameter", TYPE_FLAG,
+  defvar("logwwwDomain", 0, "Logs using wwwDomain parameter", TYPE_FLAG,
          "When enabled and when \"Logs using VHS parameters\" is disabled, 
when "
          "filename used is FQDN given by wwwDomain LDAP attribute");