[Fedora-directory-commits] ldapserver/ldap/servers/slapd log.c, 1.9, 1.10 proto-slap.h, 1.16, 1.17 util.c, 1.10, 1.11
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Sat Mar 18 17:57:46 UTC 2006
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20981
Modified Files:
log.c proto-slap.h util.c
Log Message:
185811 - Fixed windows build failures when compiling slapd_chown_if_not_owner function
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- log.c 4 Dec 2005 01:54:37 -0000 1.9
+++ log.c 18 Mar 2006 17:57:39 -0000 1.10
@@ -3540,11 +3540,13 @@
return LOG_UNABLE_TO_OPENFILE;
}
+#ifndef _WIN32
/* make sure the logfile is owned by the localuser. If one of the
* alternate ns-slapd modes, such as db2bak, tries to log an error
* at startup, it will create the logfile as root!
*/
slapd_chown_if_not_owner(loginfo.log_error_file, pw->pw_uid, -1);
+#endif
loginfo.log_error_fdes = fp;
if (logfile_state == LOGFILE_REOPENED) {
Index: proto-slap.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- proto-slap.h 25 Jan 2006 16:51:39 -0000 1.16
+++ proto-slap.h 18 Mar 2006 17:57:39 -0000 1.17
@@ -607,7 +607,9 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
+#ifndef _WIN32
int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#endif
int slapd_comp_path(char *p0, char *p1);
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util.c 16 Feb 2006 17:39:53 -0000 1.10
+++ util.c 18 Mar 2006 17:57:39 -0000 1.11
@@ -717,6 +717,7 @@
Returns 0 upon success or non-zero otherwise, usually -1 if
some system error occurred
*/
+#ifndef _WIN32
int
slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid)
{
@@ -737,6 +738,7 @@
return result;
}
+#endif
/*
* Compare 2 pathes
More information about the Fedora-directory-commits
mailing list