Merge branch 'master' into wip/win32-port2

2009-11-24 21:46:10 -08:00
parent f1c0c1bba3 d00f9984a5
commit 2204b852a7
16 changed files with 153 additions and 15 deletions
--- a/lib/krb5/kuserok.c
+++ b/lib/krb5/kuserok.c
@@ -136,7 +136,6 @@ check_directory(krb5_context context,
    if((d = opendir(dirname)) == NULL)
 	return errno;

-#ifdef HAVE_DIRFD
    {
 	int fd;
 	struct stat st2;
@@ -151,7 +150,6 @@ check_directory(krb5_context context,
 	    return EACCES;
 	}
    }
-#endif

    while((dent = readdir(d)) != NULL) {
 	if(strcmp(dent->d_name, ".") == 0 ||