Pass fds to krb5_lock_file() and krb5_unlock_file()

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6539 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 12 insertions, 17 deletions

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 710798539..bc8c9e79c 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,6 @@
+Wed Aug 16 02:45:19 1995  Chris Provenzano <proven@mit.edu>
+
+        * kprop.c, kpropd.c: Pass fds to krb5_lock_file() and krb5_unlock_file()
 
 Fri Jul 7 16:34:36 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Remove all explicit library handling and LDFLAGS.
diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 34607e309..8a4618fdc 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -437,7 +437,6 @@ void kerberos_authenticate(context, auth_context, fd, me, new_creds)
 	krb5_free_ap_rep_enc_part(context, rep_result);
 }
 
-FILE * dbfp;
 char * dbpathname;
 /*
  * Open the Kerberos database dump file.  Takes care of locking it
@@ -465,13 +464,13 @@ open_database(context, data_fn, size)
  		    data_fn);
  	    exit(1);
  	}
-	if ((dbfp = fopen(dbpathname, "r")) == 0) {
+	if ((fd = open(dbpathname, O_RDONLY)) < 0) {
 		com_err(progname, errno, "while trying to open %s",
 			dbpathname);
 		exit(1);
 	}
 
-	err = krb5_lock_file(context, dbfp, dbpathname,
+	err = krb5_lock_file(context, fd,
 			     KRB5_LOCKMODE_SHARED|KRB5_LOCKMODE_DONTBLOCK);
 	if (err == EAGAIN || err == EWOULDBLOCK || errno == EACCES) {
 	    com_err(progname, 0, "database locked");
@@ -480,7 +479,6 @@ open_database(context, data_fn, size)
 	    com_err(progname, err, "while trying to lock '%s'", dbpathname);
 	    exit(1);
 	}	    
-	fd = fileno(dbfp);
 	if (fstat(fd, &stbuf)) {
 		com_err(progname, errno, "while trying to stat %s",
 			data_fn);
@@ -514,15 +512,10 @@ close_database(context, fd)
     int fd;
 {
     int err;
-    if (fd != fileno(dbfp)) {
-	com_err(progname, 0, "bad fd passed to close_database");
-	exit(1);
-    }
-    err = krb5_lock_file(context, dbfp, dbpathname, KRB5_LOCKMODE_UNLOCK);
-    if (err)
+    if (err = krb5_lock_file(context, fd, KRB5_LOCKMODE_UNLOCK));
 	com_err(progname, err, "while unlocking database '%s'", dbpathname);
     free(dbpathname);
-    (void) fclose(dbfp);
+    (void)close(fd);
     return;
 }
   
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 013c47e84..73d5dd4b5 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -232,7 +232,7 @@ void doit(fd)
 	int on = 1, fromlen;
 	struct hostent	*hp;
 	krb5_error_code	retval;
-	FILE *lock_fp;
+	int lock_fd;
 	int omask;
 
 	fromlen = sizeof (from);
@@ -279,9 +279,9 @@ void doit(fd)
 		exit(1);
 	}
 	omask = umask(077);
-	lock_fp = fopen(temp_file_name, "a");
+	lock_fd = fopen(temp_file_name, O_RDONLY);
 	(void) umask(omask);
-	retval = krb5_lock_file(kpropd_context, lock_fp, temp_file_name,
+	retval = krb5_lock_file(kpropd_context, lock_fd, 
 				KRB5_LOCKMODE_EXCLUSIVE|KRB5_LOCKMODE_DONTBLOCK);
 	if (retval) {
 	    com_err(progname, retval, "while trying to lock '%s'",
@@ -307,13 +307,12 @@ void doit(fd)
 		exit(1);
 	}
 	load_database(kpropd_context, kdb5_edit, file);
-	retval = krb5_lock_file(kpropd_context, lock_fp, temp_file_name, 
-				KRB5_LOCKMODE_UNLOCK);
+	retval = krb5_lock_file(kpropd_context, lock_fd, KRB5_LOCKMODE_UNLOCK);
 	if (retval) {
 	    com_err(progname, retval, "while unlocking '%s'", temp_file_name);
 	    exit(1);
 	}
-	(void) fclose(lock_fp);
+	(void)close(lock_fd);
 	exit(0);
 }