[Fedora-directory-commits] adminserver/include netsite.h, 1.4, 1.5 version.h, 1.7, NONE

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28528/adminserver/include

Modified Files:
	netsite.h 
Removed Files:
	version.h 
Log Message:
remove obsolete files; make sure all adminserver files are branded plain old GPLv2, instead of GPL + exception like directory server


Index: netsite.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/netsite.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netsite.h	18 Aug 2005 19:14:21 -0000	1.4
+++ netsite.h	24 Jul 2007 20:10:16 -0000	1.5
@@ -48,78 +48,10 @@
 #define EXTERNC
 #endif
 
-#ifndef VERSION_H
-#include "version.h"
-#endif /* !VERSION_H */
-
 #ifndef BASE_SYSTEMS_H
 #include "base/systems.h"
 #endif /* !BASE_SYSTEMS_H */
 
-#define MAGNUS_VENDER_NAME VI_COMPANYNAME
-
-#ifdef MCC_PROXY
-#define MAGNUS_VERSION PROXY_VERSION_DEF
-#define MAGNUS_VERSION_STRING PROXY_VERSION_STRING
-
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION CMS_VERSION_DEF
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-
-#elif defined(NS_DS)
-#define MAGNUS_VERSION DS_VERSION_DEF
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-
-#elif defined(MCC_ADMSERV)
-#define MAGNUS_VERSION ADMSERV_VERSION_DEF
-#define MAGNUS_VERSION_STRING ADMSERV_VERSION_STRING
-#define MAGNUS_SERVER_NAME ADMSERV_NAME
-
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION CATALOG_VERSION_DEF
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION RDS_VERSION_DEF
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-
-#elif defined(MCC_HTTPD)
-
-#ifdef NS_PERSONAL
-#define MAGNUS_VERSION PERSONAL_VERSION_DEF
-#else
-#define MAGNUS_VERSION ENTERPRISE_VERSION_DEF
-#endif
-
-#if defined(XP_UNIX) || defined(USE_ADMSERV)
-#if defined(NS_DS)
-#define MAGNUS_VERSION_STRING DS_VERSION_STRING
-#elif defined(NS_PERSONAL)
-#define MAGNUS_VERSION_STRING PERSONAL_VERSION_STRING
-#elif defined(NS_CATALOG)
-#define MAGNUS_VERSION_STRING CATALOG_VERSION_STRING
-#elif defined(NS_RDS)
-#define MAGNUS_VERSION_STRING RDS_VERSION_STRING
-#elif defined(NS_CMS)
-#define MAGNUS_VERSION_STRING CMS_VERSION_STRING
-#else
-#define MAGNUS_VERSION_STRING ENTERPRISE_VERSION_STRING
-#endif
-#endif /* XP_UNIX */
-
-#elif defined(MCC_NEWS)
-#define MAGNUS_VERSION_STRING NEWS_VERSION_STRING
-
-#elif defined(NS_MAIL)
-#define MAGNUS_VERSION MAIL_VERSION_DEF
-#define MAGNUS_VERSION_STRING MAIL_VERSION_STRING
-
-#elif defined(MCC_BATMAN)
-#define MAGNUS_VERSION BATMAN_VERSION_DEF
-#define MAGNUS_VERSION_STRING BATMAN_VERSION_STRING
-
-#endif
-
 #ifndef VOID
 #define VOID void
 #endif


--- version.h DELETED ---