diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ldaputil/examples/Certmap.mak | 26 | ||||
| -rw-r--r-- | lib/ldaputil/utest/auth.cpp | 4 | ||||
| -rwxr-xr-x | lib/ldaputil/utest/authtest | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/certmap.conf | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/stubs.cpp | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/test.ref | 14 | ||||
| -rw-r--r-- | lib/libsi18n/getstrmem.h | 12 |
7 files changed, 31 insertions, 31 deletions
diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak index bde0f1b3..03139cc7 100644 --- a/lib/ldaputil/examples/Certmap.mak +++ b/lib/ldaputil/examples/Certmap.mak @@ -104,8 +104,8 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32"\ +# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32"\ /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. @@ -131,7 +131,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ LINK32_OBJS= \ "$(INTDIR)\init.obj" \ "$(INTDIR)\plugin.obj" \ - "C:\Fedora\servers\lib\nsldap32v10.lib" + "C:\$(VENDOR)\servers\lib\nsldap32v10.lib" "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -170,8 +170,8 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D\ +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D\ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX\ /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c CPP_OBJS=.\Debug/ @@ -198,7 +198,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ LINK32_OBJS= \ "$(INTDIR)\init.obj" \ "$(INTDIR)\plugin.obj" \ - "C:\Fedora\servers\lib\nsldap32v10.lib" + "C:\$(VENDOR)\servers\lib\nsldap32v10.lib" "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -243,9 +243,9 @@ LINK32_OBJS= \ SOURCE=.\plugin.c DEP_CPP_PLUGI=\ ".\plugin.h"\ - "c:\Fedora\servers\include\certmap.h"\ - "c:\Fedora\servers\include\lber.h"\ - "c:\Fedora\servers\include\ldap.h"\ + "c:\$(VENDOR)\servers\include\certmap.h"\ + "c:\$(VENDOR)\servers\include\lber.h"\ + "c:\$(VENDOR)\servers\include\ldap.h"\ {$(INCLUDE)}"\sys\types.h"\ @@ -259,9 +259,9 @@ DEP_CPP_PLUGI=\ SOURCE=.\init.c DEP_CPP_INIT_=\ ".\plugin.h"\ - "c:\Fedora\servers\include\certmap.h"\ - "c:\Fedora\servers\include\lber.h"\ - "c:\Fedora\servers\include\ldap.h"\ + "c:\$(VENDOR)\servers\include\certmap.h"\ + "c:\$(VENDOR)\servers\include\lber.h"\ + "c:\$(VENDOR)\servers\include\ldap.h"\ {$(INCLUDE)}"\sys\types.h"\ @@ -272,7 +272,7 @@ DEP_CPP_INIT_=\ ################################################################################ # Begin Source File -SOURCE=C:\Fedora\servers\lib\nsldap32v10.lib +SOURCE=C:\$(VENDOR)\servers\lib\nsldap32v10.lib !IF "$(CFG)" == "Certmap - Win32 Release" diff --git a/lib/ldaputil/utest/auth.cpp b/lib/ldaputil/utest/auth.cpp index a5d78906..46be3a2b 100644 --- a/lib/ldaputil/utest/auth.cpp +++ b/lib/ldaputil/utest/auth.cpp @@ -58,7 +58,7 @@ static const char* dllname = "plugin.so"; -char *global_issuer_dn = "o=Fedora Project, c=US"; +char *global_issuer_dn = "o=" VENDOR ", c=US"; #define NSPR_INIT(Program) (PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 8)) @@ -99,7 +99,7 @@ static int ldapu_certinfo_delete_test (const char *fname, const char *old_fname) } /* rv = ldapu_certinfo_delete("o=Ace Industry, c=US"); */ - rv = ldapu_certinfo_delete("o=Fedora Project, c=US"); + rv = ldapu_certinfo_delete("o=" VENDOR ", c=US"); if (rv != LDAPU_SUCCESS) { fprintf(stderr, "ldapu_certinfo_delete failed. Reason: %s\n", diff --git a/lib/ldaputil/utest/authtest b/lib/ldaputil/utest/authtest index 055a4713..38e206cf 100755 --- a/lib/ldaputil/utest/authtest +++ b/lib/ldaputil/utest/authtest @@ -119,7 +119,7 @@ must_succeed ./auth 9 "o=Ace Industry, c=US" "cn=Kirsten Vaughan, ou=Human Resou #must_fail ./auth 9 "default" "cn=Kirsten Vaughan, o=Ace Industry, c=US" # test for encode/decode bindpw -must_succeed ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar" +must_succeed ./auth 10 "cn=Foo Bar, o=$VENDOR, c=US" "foobar" # test for reading dbnames from dbswitch.conf file must_succeed ./auth 11 dblist.conf ignore diff --git a/lib/ldaputil/utest/certmap.conf b/lib/ldaputil/utest/certmap.conf index 248b6099..b68d9a94 100644 --- a/lib/ldaputil/utest/certmap.conf +++ b/lib/ldaputil/utest/certmap.conf @@ -53,7 +53,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Fedora Project, c=US +certmap default1 o=VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c diff --git a/lib/ldaputil/utest/stubs.cpp b/lib/ldaputil/utest/stubs.cpp index d9bafdf8..aaa5bc69 100644 --- a/lib/ldaputil/utest/stubs.cpp +++ b/lib/ldaputil/utest/stubs.cpp @@ -63,7 +63,7 @@ NSAPI_PUBLIC int ldapu_get_cert_subject_dn (void *cert_in, char **subjectDN) NSAPI_PUBLIC int ldapu_get_cert_issuer_dn (void *cert, char **issuerDN) { /* TEMPORARY -- not implemented yet*/ - *issuerDN = strdup("o=Fedora Project, c=US"); + *issuerDN = strdup("o=" VENDOR ", c=US"); return *issuerDN ? LDAPU_SUCCESS : LDAPU_FAILED; } diff --git a/lib/ldaputil/utest/test.ref b/lib/ldaputil/utest/test.ref index 8f621df6..dfb71acc 100644 --- a/lib/ldaputil/utest/test.ref +++ b/lib/ldaputil/utest/test.ref @@ -286,9 +286,9 @@ plugin_verify_fn called. Matched entry to cert: "cn=Kirsten Vaughan, ou=Human Resources, o=Ace Industry, c=US" Authentication succeeded. -Start of test: ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar" +Start of test: ./auth 10 "cn=Foo Bar, o=$VENDOR, c=US" "foobar" Config file written: config_out.conf -binddn from config file: "cn=Foo Bar, o=Fedora Project, c=US" +binddn from config file: "cn=Foo Bar, o=$VENDOR, c=US" bindpw from config file: "foobar" Config file test succeeded Authentication succeeded. @@ -323,7 +323,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Fedora Project, c=US +certmap default1 o=$VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -349,7 +349,7 @@ default2:verifycert on certmap default default -certmap default1 o=Fedora Project, c=US +certmap default1 o=$VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -382,7 +382,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Fedora Project, c=US +certmap default1 o=$VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -435,7 +435,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Fedora Project, c=US +certmap default1 o=$VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -461,7 +461,7 @@ default2:verifycert on certmap default default -certmap default1 o=Fedora Project, c=US +certmap default1 o=$VENDOR, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c diff --git a/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h index cbdcbd17..937885bc 100644 --- a/lib/libsi18n/getstrmem.h +++ b/lib/libsi18n/getstrmem.h @@ -92,7 +92,7 @@ static char* userforms[] = { "", "Error: could not open servers list file.<p>\n", "Error: could not open %s server list file.<p>\n", - "Fedora Server Account", + CAPBRAND " Server Account", "Server Account Management for %s", "Server Account Management", emptyString }; @@ -508,7 +508,7 @@ static char* httpdaemon[] = { "warning: daemon is running as super-user\n", "could not determine current user name\n", "error: chroot to %s failed (%s)\n", - "WARNING! Fedora executable and library have different versions.\n", + "WARNING! " CAPBRAND " executable and library have different versions.\n", "startup: listening to %s://%s, port %d as %s\n", "startup: listening to %s://%s, port %d as %s\n", "seminit failed (%s)\n", @@ -856,7 +856,7 @@ static char* base[] = { "unable to allocate hash entry", "cache_insert: unable to create cache entry", "HTTP/1.0 200 OK\nContent-type: text/html\n\n", - "<H2>Fedora cache status report</H2>\n", + "<H2>" CAPBRAND " cache status report</H2>\n", "No caches on system<P>", "<H2>%s cache</H2>\n", "Cache hit ratio: %d/%d (%f)</P>\n</P>\n", @@ -891,7 +891,7 @@ static char* base[] = { "error getting processor info for processor %d", "Error binding to processor %d", "bound process %d to processor %d", - "Fedora server is not explicitly binding to any processors.", + CAPBRAND " server is not explicitly binding to any processors.", "cache monitor exited", "cache batch update daemon exited", "Using single threaded accepts.", @@ -900,7 +900,7 @@ static char* base[] = { "This machine has %d processors.", "Error calling thr_seconcurrency(%d)- (%s)", "Set conncurrency to %d.", - "WARNING! Fedora executable and library have different versions.\n", + "WARNING! " CAPBRAND " executable and library have different versions.\n", "", "", "seminit failed (%s)\n", @@ -966,7 +966,7 @@ static char* base[] = { "dns-cache-insert: malloc failure", "successful server startup", "%s B%s", - "Fedora executable and shared library have different versions", + CAPBRAND " executable and shared library have different versions", " executable version is %s", " shared library version is %s", "error reporting shutting down", |