o move path in libutil.h to paths.h

o make property_read() take a fd instead to avoid stdio.h mess
o update auth to new interface.

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 0894066..05c3917 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -32,9 +32,11 @@
  *
  */
 
-#include <stdio.h>
+#include <unistd.h>
 #include <syslog.h>
 #include <sys/types.h>
+#include <paths.h>
+#include <fcntl.h>
 #include <libutil.h>
 
 static properties P;
@@ -42,15 +44,15 @@ static properties P;
 static int
 initauthconf(const char *path)
 {
-    FILE *fp;
+    int fd;
 
     if (!P) {
-	if ((fp = fopen(path, "r")) == NULL) {
+	if ((fd = open(path, O_RDONLY)) < 0) {
 	    syslog(LOG_ERR, "initauthconf: unable to open file: %s", path);
 	    return 1;
 	}
-	P = properties_read(fp);
-	fclose(fp);
+	P = properties_read(fd);
+	close(fd);
 	if (!P) {
 	    syslog(LOG_ERR, "initauthconf: unable to parse file: %s", path);
 	    return 1;