Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20871
Modified Files:
Tag: Directory71RtmBranch
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.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- log.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
+++ log.c 18 Mar 2006 17:48:37 -0000 1.6.2.2
@@ -3298,12 +3298,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.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- proto-slap.h 23 Nov 2005 01:22:16 -0000 1.10.2.2
+++ proto-slap.h 18 Mar 2006 17:48:37 -0000 1.10.2.3
@@ -588,7 +588,9 @@
*/
void slapd_nasty(char* str, int c, int err);
int strarray2str( char **a, char *buf, size_t buflen, int include_quotes );
-int slapd_slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#ifndef _WIN32
+int slapd_chown_if_not_owner(const char *filename, uid_t uid, gid_t gid);
+#endif
/*
* modify.c
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- util.c 23 Nov 2005 01:22:16 -0000 1.6.2.1
+++ util.c 18 Mar 2006 17:48:37 -0000 1.6.2.2
@@ -637,6 +637,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)
{
@@ -657,4 +658,4 @@
return result;
}
-
+#endif
Show replies by date