Ver.1.4.27: Fix error in setting the default pam service name. Fix previous fix.

diff --git a/opengate/doc/Changes.html b/opengate/doc/Changes.html
index aa5d599..c1b6378 100644 (file)
--- a/opengate/doc/Changes.html
+++ b/opengate/doc/Changes.html
@@ -613,6 +613,11 @@ Ver.1.4.26 at 2008.2.29</DT>
 <DD>\r
 Fix error in 64 bits machine.\r
 </DD>\r
+<DT>\r
+Ver.1.4.27 at 2008.3.3</DT>\r
+<DD>\r
+Fix error in setting the default pam service name. Fix previous fix.\r
+</DD>\r
 \r
 </DL>\r
 <b>Please see CVS in SourceForge.net to check the file difference between versions.</b>\r

diff --git a/opengate/opengatesrv/addr-convert.c b/opengate/opengatesrv/addr-convert.c
index 47e965b..a8f50c0 100644 (file)
--- a/opengate/opengatesrv/addr-convert.c
+++ b/opengate/opengatesrv/addr-convert.c
@@ -55,7 +55,7 @@ int addrEncode(char encodeAddr[], char dotSepAddr[])
   /* the string has the from as [encodeAddress-checkDigit-TimeNow] */
   if(!illform){
     snprintf(encodeAddr, ADDRMAXLN,
-            "%lu-%d-%d", address,checkDigit, time(NULL));
+            "%lu-%d-%d", address,checkDigit, (int)time(NULL));
   }else{
     encodeAddr[0]='\0';
   }

diff --git a/opengate/opengatesrv/auth-pam.c b/opengate/opengatesrv/auth-pam.c
index a7313bc..0db4b7c 100644 (file)
--- a/opengate/opengatesrv/auth-pam.c
+++ b/opengate/opengatesrv/auth-pam.c
@@ -47,16 +47,19 @@ typedef struct {
 /******************************/
 int authPam(char *userid, char *passwd)
 {
-  char* serviceName;
+  char serviceName[ADDRMAXLN];
+  char *serviceNameInConf;
   pam_handle_t *pamh=NULL;
   int retval;
   userInfo_t userInfo;
   
   /* get pam service name used in pam config file */
-  serviceName=GetConfValue("AuthServer/ServiceName");
+  serviceNameInConf=GetConfValue("AuthServer/ServiceName");
 
-  if(serviceName==NULL){
+  if(isNull(serviceNameInConf)){
     strncpy(serviceName, PAMSERVICENAME, ADDRMAXLN);
+  }else{
+    strncpy(serviceName, serviceNameInConf, ADDRMAXLN);
   }
   
   if(!userid || !passwd) return DENY;