[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeadmin/kuser
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-06-17 21:34:08
Message-ID: 20040617213408.DAFFA983A () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

Ok, that last commit was a little half-baked.  This should work better.


  M +1 -1      configure.in.in   1.16
  M +2 -2      kgroupfiles.cpp   1.6
  M +4 -4      kuserfiles.cpp   1.5


--- kdeadmin/kuser/configure.in.in  #1.15:1.16
@@ -54,5 +54,5 @@
 AC_SUBST(KU_MAILBOX_GID)
 
-AC_CHECK_DECLS([fgetpwent, fgetgrent, fgetspent])
+AC_CHECK_DECLS([fgetpwent, fgetgrent, fgetspent], [], [], [#include <pwd.h>])
 
 AC_LANG_SAVE

--- kdeadmin/kuser/kgroupfiles.cpp  #1.5:1.6
@@ -117,5 +117,5 @@ bool KGroupFiles::reload()
 
   // We are reading our configuration specified group file
-#ifdef HAVE_FGETGRENT
+#ifdef HAVE_DECL_FGETGRENT
     FILE *fgrp = fopen(QFile::encodeName(filename), "r");
     QString tmp;
@@ -147,5 +147,5 @@ bool KGroupFiles::reload()
     // End reading filename
 
-#ifdef HAVE_FGETGRENT
+#ifdef HAVE_DECL_FGETGRENT
     fclose(fgrp);
 #else

--- kdeadmin/kuser/kuserfiles.cpp  #1.4:1.5
@@ -153,5 +153,5 @@ bool KUserFiles::loadpwd()
     QString tmp;
 
-#ifdef HAVE_FGETPWENT
+#ifdef HAVE_DECL_FGETPWENT
     FILE *fpwd = fopen(QFile::encodeName(filename), "r");
     if(fpwd == NULL) {
@@ -191,5 +191,5 @@ bool KUserFiles::loadpwd()
     // End reading passwd_filename
 
-#ifdef HAVE_FGETPWENT
+#ifdef HAVE_DECL_FGETPWENT
     fclose(fpwd);
 #else
@@ -234,5 +234,5 @@ bool KUserFiles::loadsdw()
   sdw_gid = st.st_gid;
 
-#ifdef HAVE_FGETSPENT
+#ifdef HAVE_DECL_FGETSPENT
   FILE *f;
   kdDebug() << "open shadow file: " << shadow_file << endl;
@@ -272,5 +272,5 @@ bool KUserFiles::loadsdw()
   }
 
-#ifdef HAVE_FGETSPENT
+#ifdef HAVE_DECL_FGETSPENT
   fclose(f);
 #else


[prev in list] [next in list] [prev in thread] [next in thread]