[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_replica.c, 1.11, 1.12

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/servers/plugins/replication

Modified Files:
	repl5_replica.c 
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m 
it should use x86 for the arch.  However, it should only do this if 
uname -m is not x86_64.  Also, for RHEL/Linux, we do not have to add the 
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.  
Other platforms continue to use the other naming convention.  The 
default naming convention for the mozilla components is 
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ.  I considered using Wan-Teh's 
instructions about source builds, but that would cause many changes to 
be made to our makefiles, so I just changed the way we calculate the 
mozilla OBJDIR name from the regular OBJDIR name.  These changes are 
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.

For ldapserver, I had to change nsarch (adminserver changed nsarch in a 
different way).  I also got rid of the 32 bit specific setup stuff.  I 
assume this was due to 32 bit NES admin server, so we can get rid of 
this for the future, because we will have all native 64 bit apps. I also 
went ahead and rolled in the gcc4 changes since they are safe for gcc3 
as well.



Index: repl5_replica.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- repl5_replica.c	19 Apr 2005 22:07:32 -0000	1.11
+++ repl5_replica.c	15 Feb 2006 22:54:07 -0000	1.12
@@ -108,9 +108,9 @@
 static char * _replica_get_config_dn (const Slapi_DN *root);
 static char * _replica_type_as_string (const Replica *r);
 /* DBDB, I think this is probably bogus : */
-int replica_create_ruv_tombstone(Replica *r);
-void assign_csn_callback(const CSN *csn, void *data);
-void abort_csn_callback(const CSN *csn, void *data);
+static int replica_create_ruv_tombstone(Replica *r);
+static void assign_csn_callback(const CSN *csn, void *data);
+static void abort_csn_callback(const CSN *csn, void *data);
 static void eq_cb_reap_tombstones(time_t when, void *arg);
 static CSN *_replica_get_purge_csn_nolock (const Replica *r);
 static void replica_get_referrals_nolock (const Replica *r, char ***referrals);