389-commits July 2008

389-commits@lists.fedoraproject.org

1 participants
104 discussions

[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSCreate.pm.in, 1.12, 1.13
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13491/ldapserver/ldap/admin/src/scripts Modified Files: DSCreate.pm.in Log Message: Resolves: bug 435774 Bug Description: Unhandled error during setup: Could not import LDIF file Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: This doesn't allow you to re-prompt for the file, but this will at least cause setup to output a sensible error message if it detects that the given LDIF file is not readable. Platforms tested: Fedora 8, Fedora 9 Flag Day: no Doc impact: no Index: DSCreate.pm.in =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSCreate.pm.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- DSCreate.pm.in 14 Jul 2008 19:37:15 -0000 1.12 +++ DSCreate.pm.in 14 Jul 2008 23:16:47 -0000 1.13 @@ -467,8 +467,11 @@ if ($ldiffile =~ /none/i) { debug(1, "No ldif file or org entries specified - no initial database will be created\n"); return (); - } elsif ($ldiffile && -f $ldiffile) { + } elsif ($ldiffile && ($ldiffile !~ /suggest/i)) { debug(1, "Loading initial ldif file $ldiffile\n"); + if (! -r $ldiffile) { + return ('error_opening_init_ldif', $ldiffile); + } } elsif (($inf->{slapd}->{Suffix} =~ /^(.*?)=/) && $suffixTable{$1}) { my @errs; my $template = $inf->{General}->{prefix} . $suffixTable{$1};

1 0

[Fedora-directory-commits] adminserver/lib/libsi18n getstrprop.c, 1.4, 1.4.2.1 gsadmserv.h, 1.6, 1.6.2.1 coreres.c, 1.3, NONE coreres.h, 1.3, NONE getlang.c, 1.5, NONE lock.h, 1.3, NONE makstrdb.c, 1.4, NONE propset.c, 1.4, NONE propset.h, 1.3, NONE reshash.c, 1.3, NONE reshash.h, 1.3, NONE txtfile.c, 1.4, NONE txtfile.h, 1.3, NONE
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libsi18n In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/lib/libsi18n Modified Files: Tag: Directory_Server_8_0_Branch getstrprop.c gsadmserv.h Removed Files: Tag: Directory_Server_8_0_Branch coreres.c coreres.h getlang.c lock.h makstrdb.c propset.c propset.h reshash.c reshash.h txtfile.c txtfile.h Log Message: remove obsolete code from 8.0 branch Index: getstrprop.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libsi18n/getstrprop.c,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- getstrprop.c 31 Mar 2006 22:58:34 -0000 1.4 +++ getstrprop.c 14 Jul 2008 20:58:47 -0000 1.4.2.1 @@ -27,71 +27,20 @@ #include "getstrmem.h" -#include "libadminutil/resource.h" -#include "coreres.h" - -Resource *hResource = NULL; -char empty_string[] = ""; - char* XP_GetStringFromMemory(char* strLibraryName,int iToken); - -void -XP_InitStringDatabase(char* pathCWD, char* databaseName) -{ - hResource = core_res_init_resource (pathCWD, databaseName); -} - -char *XP_GetPropertyString(char* strLibraryName,int iToken, ACCEPT_LANGUAGE_LIST lang) -{ - char *key_name; - char *result = NULL; - - if (hResource == NULL) - return NULL; - - /*creating the key*/ - key_name=(char*)malloc(strlen(strLibraryName) + 10); - sprintf(key_name, "%s-%d", strLibraryName, iToken); - if(key_name == NULL) - return NULL; - - result = (char *) core_res_getstring(hResource, key_name, lang) ; - - if (key_name) - free (key_name); - - if (result == NULL) - return empty_string; - else - return result ; -} - char* XP_GetStringFromDatabase(char* strLibraryName, char* strLanguage, int key) { char *result = NULL; - ACCEPT_LANGUAGE_LIST alanglist; - int n; - /* - * display first choice language if available, otherwise - * use default which is english in most case - */ - if (hResource) { - n = XP_AccLangList (strLanguage, alanglist); - if (n >= MAX_ACCEPT_LANGUAGE) - alanglist[MAX_ACCEPT_LANGUAGE-1][0] = '\0'; - else - alanglist[n][0] = '\0'; - result = XP_GetPropertyString(strLibraryName, key, alanglist); - } - - /* we should never come here. */ + /* we should eventually port this to use proper adminutil + resources, but for now, only the in-memory resource + model is supported */ if (result == NULL) result = XP_GetStringFromMemory(strLibraryName,key); return result; @@ -150,115 +99,3 @@ } } - -#if 0 -#include "base/crit.h" -#include "base/systhr.h" -static int Initialized = 0; - -#ifdef XP_UNIX - -#include <sys/types.h> -#include <sys/ipc.h> -#include <sys/sem.h> -#include <unistd.h> - -union _semarg -{ - int val; - struct semid_ds *buf; - ushort *array; -}; - -int _si18n_semMutex; -pid_t _lockOwner = 0; -int _si18n_waitQueue; -struct sembuf _semop_p[1] = {0,-1,0}; -struct sembuf _semop_v[1] = {0,1,0}; - - -void _si18n_lock(MutexPointer p) -{ - pid_t current_pid = getpid(); - - semop(*((int*)p),_semop_p,1); - if (current_pid != _lockOwner) - { - semop(*((int*)p),_semop_v,1); - semop(_si18n_waitQueue,_semop_p,1); /* wait for access */ - semop(*((int*)p),_semop_p,1); - _lockOwner = current_pid; - } - - semop(*((int*)p),_semop_v,1); - -} - -void _si18n_unlock(MutexPointer p) -{ - semop(*((int*)p),_semop_p,1); - - _lockOwner = 0; - semop(_si18n_waitQueue,_semop_v,1); /* signal one waiter */ - - semop(*((int*)p),_semop_v,1); - -} - -MutexImplementation _nlsMutexImplementation = -{ - &_si18n_semMutex, - _si18n_lock, - _si18n_unlock -}; - -MutexImplementation* _pMutexImplementation = &_nlsMutexImplementation; - - -void InitSynchronization(void) -{ - union _semarg val; - - val.val = 1; /* to avoid an aligment fault on certain platforms */ - - _si18n_semMutex = semget(IPC_PRIVATE,1,IPC_CREAT | 0600); - _si18n_waitQueue = semget(IPC_PRIVATE,1,IPC_CREAT | 0600); - - semctl(_si18n_semMutex,0,SETVAL,val); - semctl(_si18n_waitQueue,0,SETVAL,val); -} - -#else -#include "lock.h" -#include <windows.h> - -static CRITICAL_SECTION _csMutex; - -void _lock(MutexPointer p) -{ - EnterCriticalSection((CRITICAL_SECTION*)p); -} - -void _unlock(MutexPointer p) -{ - LeaveCriticalSection((CRITICAL_SECTION*)p); -} - -MutexImplementation _nlsMutexImplementation = -{ - &_csMutex, - _lock, - _unlock -}; - -MutexImplementation* _pMutexImplementation = &_nlsMutexImplementation; - -void InitSynchronization(void) -{ - InitializeCriticalSection(&_csMutex); -} - -#endif - -#endif - Index: gsadmserv.h =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libsi18n/gsadmserv.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- gsadmserv.h 18 Jul 2007 22:10:31 -0000 1.6 +++ gsadmserv.h 14 Jul 2008 20:58:47 -0000 1.6.2.1 @@ -26,13 +26,10 @@ #undef LIBRARY_NAME #include "../admserv/cgi-src40/dbtcgiadmin.h" #undef LIBRARY_NAME -#include "base/dbtbase.h" -#undef LIBRARY_NAME #include "libadmin/dbtlibadmin.h" -static RESOURCE_GLOBAL allxpstr[] = { +static res_RESOURCE_GLOBAL allxpstr[] = { admserv, - base, 0 }; --- coreres.c DELETED --- --- coreres.h DELETED --- --- getlang.c DELETED --- --- lock.h DELETED --- --- makstrdb.c DELETED --- --- propset.c DELETED --- --- propset.h DELETED --- --- reshash.c DELETED --- --- reshash.h DELETED --- --- txtfile.c DELETED --- --- txtfile.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/libadmin install.c, 1.6, 1.6.2.1 util.c, 1.10, 1.10.2.1
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/lib/libadmin Modified Files: Tag: Directory_Server_8_0_Branch install.c util.c Log Message: remove obsolete code from 8.0 branch Index: install.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libadmin/install.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- install.c 9 May 2007 00:26:37 -0000 1.6 +++ install.c 14 Jul 2008 20:58:47 -0000 1.6.2.1 @@ -51,7 +51,7 @@ { int sd; struct sockaddr_in sa_server; - int one = 1, ret; + int ret; #ifdef XP_WIN32 WSADATA wsd; Index: util.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libadmin/util.c,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- util.c 31 Oct 2007 05:30:54 -0000 1.10 +++ util.c 14 Jul 2008 20:58:47 -0000 1.10.2.1 @@ -186,130 +186,6 @@ return ans; } -int ADM_mkdir_p(char *dir, int mode) -{ - char path[PATH_MAX]; - struct stat fi; - char *slash = NULL; - - if (dir) - PL_strncpyz (path, dir, sizeof(path)); - else - return 0; - - if (slash = strchr(path, FILE_PATHSEP)) - slash++; /* go past root */ - else - return 0; - - while (slash && *slash) { - slash = strchr(slash, FILE_PATHSEP); - if (slash) *slash = '\0'; /* check path till here */ - - if (stat(path, &fi) == -1) { -#ifdef XP_UNIX - if (mkdir(path, mode) == -1) -#else /* XP_WIN32 */ - if (!CreateDirectory(path, NULL)) -#endif - return 0; - } - - if (slash) { - *slash = FILE_PATHSEP; /* restore path */ - slash++; /* check remaining path */ - } - } - return 1; -} - -int ADM_copy_directory(char *src_dir, char *dest_dir) -{ - SYS_DIR ds; - SYS_DIRENT *d; - struct stat fi; - char src_file[PATH_MAX], dest_file[PATH_MAX], fullname[PATH_MAX]; - - if (!(ds = dir_open(src_dir))) - report_error(FILE_ERROR, "Can't read directory", src_dir); - - while (d = dir_read(ds)) { - if (d->d_name[0] != '.') { - PR_snprintf(fullname, sizeof(fullname), "%s/%s", src_dir, d->d_name); - if (system_stat(fullname, &fi) == -1) - continue; - - PR_snprintf(src_file, sizeof(src_file), "%s%c%s", src_dir, FILE_PATHSEP, d->d_name); - PR_snprintf(dest_file, sizeof(dest_file), "%s%c%s", dest_dir, FILE_PATHSEP, d->d_name); - if (S_ISDIR(fi.st_mode)) { - char *sub_src_dir = STRDUP(src_file); - char *sub_dest_dir = STRDUP(dest_file); - if (!ADM_mkdir_p(sub_dest_dir, 0755)) { - report_error(FILE_ERROR, "Cannot create directory", - sub_dest_dir); - return 0; - } - if (!ADM_copy_directory(sub_src_dir, sub_dest_dir)) - return 0; - FREE(sub_src_dir); - FREE(sub_dest_dir); - } - else - cp_file(src_file, dest_file, 0644); - } - } - dir_close(ds); - return(1); -} - -void ADM_remove_directory(char *path) -{ - struct stat finfo; - char **dirlisting; - register int x=0; - int stat_good = 0; - char *fullpath = NULL; - -#ifdef XP_UNIX - stat_good = (lstat(path, &finfo) == -1 ? 0 : 1); -#else /* XP_WIN32 */ - stat_good = (stat(path, &finfo) == -1 ? 0 : 1); -#endif - - if(!stat_good) return; - - if(S_ISDIR(finfo.st_mode)) { - dirlisting = list_directory(path,1); - if(!dirlisting) return; - - for(x=0; dirlisting[x]; x++) { - fullpath = (char *) MALLOC(strlen(path) + - strlen(dirlisting[x]) + 4); - sprintf(fullpath, "%s%c%s", path, FILE_PATHSEP, dirlisting[x]); -#ifdef XP_UNIX - stat_good = (lstat(fullpath, &finfo) == -1 ? 0 : 1); -#else /* XP_WIN32 */ - stat_good = (stat(fullpath, &finfo) == -1 ? 0 : 1); -#endif - if(!stat_good) continue; - if(S_ISDIR(finfo.st_mode)) { - ADM_remove_directory(fullpath); - } else { - unlink(fullpath); - } - FREE(fullpath); - } -#ifdef XP_UNIX - rmdir(path); -#else /* XP_WIN32 */ - RemoveDirectory(path); -#endif - } else { - delete_file(path); - } - return; -} - /* return: mtime(f1) < mtime(f2) ? */ int mtime_is_earlier(char *file1, char *file2) { @@ -1382,7 +1258,7 @@ ptr = PL_strdup(ptr); } /* copy now points at the parent, ptr at the child */ - if (pdir = PR_OpenDir(copy)) { + if ((pdir = PR_OpenDir(copy))) { for(pent = PR_ReadDir(pdir, PR_SKIP_BOTH); pent && !ret; pent = PR_ReadDir(pdir, PR_SKIP_BOTH)) { ret = !strcmp(pent->name, ptr); @@ -1393,7 +1269,7 @@ ret = 0; /* we've verified that name is a valid directory - see if the given filename exists in that directory */ - if (pdir = PR_OpenDir(name)) { + if ((pdir = PR_OpenDir(name))) { for(pent = PR_ReadDir(pdir, PR_SKIP_BOTH); pent && !ret; pent = PR_ReadDir(pdir, PR_SKIP_BOTH)) { if (childlen > 0) {

1 0

[Fedora-directory-commits] adminserver/lib/base nscputil.cpp, 1.3, 1.3.2.1 buffer.cpp, 1.4, NONE eventhandler.cpp, 1.3, NONE eventlog.cpp, 1.3, NONE ntdaemon.cpp, 1.3, NONE nterrors.cpp, 1.3, NONE ntpipe.cpp, 1.3, NONE
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/lib/base Modified Files: Tag: Directory_Server_8_0_Branch nscputil.cpp Removed Files: Tag: Directory_Server_8_0_Branch buffer.cpp eventhandler.cpp eventlog.cpp ntdaemon.cpp nterrors.cpp ntpipe.cpp Log Message: remove obsolete code from 8.0 branch Index: nscputil.cpp =================================================================== RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- nscputil.cpp 22 Jun 2007 01:34:20 -0000 1.3 +++ nscputil.cpp 14 Jul 2008 20:58:47 -0000 1.3.2.1 @@ -44,9 +44,6 @@ #include "base/util.h" -#include "base/dbtbase.h" - - #ifdef XP_UNIX #include <sys/types.h> #endif /* WIN32 */ @@ -850,66 +847,6 @@ } #endif /* NEED_STRNCASECMP */ -#ifdef XP_WIN32 - - -/* util_delete_directory() - * This routine deletes all the files in a directory. If delete_directory is - * TRUE it will also delete the directory itself. - */ -VOID -util_delete_directory(char *FileName, BOOL delete_directory) -{ - HANDLE firstFile; - WIN32_FIND_DATA findData; - char *TmpFile, *NewFile; - - if (FileName == NULL) - return; - - TmpFile = (char *)MALLOC(strlen(FileName) + 5); - sprintf(TmpFile, "%s\\*.*", FileName); - firstFile = FindFirstFile(TmpFile, &findData); - FREE(TmpFile); - - if (firstFile == INVALID_HANDLE_VALUE) - return; - - if(strcmp(findData.cFileName, ".") && - strcmp(findData.cFileName, "..")) { - NewFile = (char *)MALLOC(strlen(FileName) + 1 + - strlen(findData.cFileName) + 1); - sprintf(NewFile, "%s\\%s",FileName, findData.cFileName); - DeleteFile(NewFile); - FREE(NewFile); - } - while (TRUE) { - if(!(FindNextFile(firstFile, &findData))) { - if (GetLastError() != ERROR_NO_MORE_FILES) { -// ereport(LOG_WARN, XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_), FileName, GetLastError()); - } else { - FindClose(firstFile); - if (delete_directory) - if(!RemoveDirectory(FileName)) { -// ereport(LOG_WARN, - XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_1), - FileName, GetLastError()); - } - return; - } - } else { - if(strcmp(findData.cFileName, ".") && - strcmp(findData.cFileName, "..")) { - NewFile = (char *)MALLOC(strlen(FileName) + 5 + - strlen(findData.cFileName) + 1); - sprintf(NewFile,"%s\\%s", FileName, findData.cFileName); - DeleteFile(NewFile); - FREE(NewFile); - } - } - } -} -#endif /* ------------------------------ util_strftime --------------------------- */ /* --- buffer.cpp DELETED --- --- eventhandler.cpp DELETED --- --- eventlog.cpp DELETED --- --- ntdaemon.cpp DELETED --- --- nterrors.cpp DELETED --- --- ntpipe.cpp DELETED ---

1 0

[Fedora-directory-commits] adminserver/include/libadmin libadmin.h, 1.9, 1.9.2.1
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/include/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/include/libadmin Modified Files: Tag: Directory_Server_8_0_Branch libadmin.h Log Message: remove obsolete code from 8.0 branch Index: libadmin.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/libadmin/libadmin.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- libadmin.h 31 Oct 2007 05:30:54 -0000 1.9 +++ libadmin.h 14 Jul 2008 20:58:46 -0000 1.9.2.1 @@ -395,19 +395,6 @@ /* util.c */ NSAPI_PUBLIC int get_file_size(char *path); -/* Create a directory path if it does not exist (mkdir -p) */ -/* util.c */ -NSAPI_PUBLIC int ADM_mkdir_p(char *dir, int mode); - -/* Copy a directory recursively. */ -/* util.c */ -NSAPI_PUBLIC int ADM_copy_directory(char *src_dir, char *dest_dir); - -/* Remove a directory recursively. Same as remove_directory except that - filenames arent printed on stdout */ -/* util.c */ -NSAPI_PUBLIC void ADM_remove_directory(char *path); - /* Return: LastModificationTime(f1) < LastModificationTime(f2) ? */ /* util.c */ NSAPI_PUBLIC int mtime_is_earlier(char *file1, char *file2);

1 0

[Fedora-directory-commits] adminserver Makefile.am, 1.38, 1.38.2.1 aclocal.m4, 1.38.2.2, 1.38.2.3 configure, 1.42.2.2, 1.42.2.3 missing, 1.28.2.2, 1.28.2.3 install-sh, 1.28.2.2, 1.28.2.3 Makefile.in, 1.45.2.2, 1.45.2.3 depcomp, 1.28.2.2, 1.28.2.3 config.sub, 1.28.2.2, 1.28.2.3 config.guess, 1.28.2.2, 1.28.2.3 compile, 1.27.2.2, 1.27.2.3
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver Modified Files: Tag: Directory_Server_8_0_Branch Makefile.am aclocal.m4 configure missing install-sh Makefile.in depcomp config.sub config.guess compile Log Message: remove obsolete code from 8.0 branch Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -r1.38 -r1.38.2.1 --- Makefile.am 17 Dec 2007 20:10:04 -0000 1.38 +++ Makefile.am 14 Jul 2008 20:58:45 -0000 1.38.2.1 @@ -48,15 +48,18 @@ install-data-hook: @for file in $(RESOURCE_BUNDLES_ROOT) ; do \ - basefile=`basename $$file` ; \ - destfile=`basename $$file | sed -e s,_root,/root,` ; \ - destdir=`dirname $$destfile` ; \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$(DESTDIR)$(propertydir)/$$basefile' '$(DESTDIR)$(propertydir)/$$destfile'"; \ - $(mkdir_p) "$(DESTDIR)$(propertydir)/$$destdir" ; \ - mv "$(DESTDIR)$(propertydir)/$$basefile" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \ - cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en.res" || exit 1; \ - cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en_US.res" || exit 1; \ + progdir=`dirname $$file` ; \ + progname=`basename $$progdir` ; \ + destdir="$(DESTDIR)$(propertydir)/$$progname" ; \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \ + test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \ + cp "$$file" "$$destdir" || exit 1 ; \ + cp "$$file" "$$destdir/en.res" || exit 1 ; \ + cp "$$file" "$$destdir/en_US.res" || exit 1 ; \ done +# the makefile creates this one, but there seems to be no way to tell it not +# to, so we have to remove it before it causes problems + rm -f $(DESTDIR)$(propertydir)/root.res cgibindir = $(libdir)@cgibindir@ cmdbindir = $(sbindir) @@ -93,8 +96,7 @@ libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \ lib/base/system.cpp lib/base/nscputil.cpp -libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \ - lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c +libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \ lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \ @@ -147,7 +149,7 @@ init_SCRIPTS = wrappers/$(PACKAGE_NAME) -initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME) +initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME) ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/01nsroot.ldif.tmpl \ @@ -198,7 +200,7 @@ admserv/newinst/src/migrate-ds-admin.pl \ admserv/newinst/src/register-ds-admin.pl -perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ +perl_DATA = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ @@ -367,14 +369,14 @@ # This bundle must be always distributed and there is no need to have # *_en.properties resource bundle source files. RESOURCE_BUNDLES_ROOT = \ - admserv/cgi-src40/admpw_root.res \ - admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \ - admserv/cgi-src40/stopsrv_root.res \ - admserv/cgi-src40/dsconfig_root.res admserv/cgi-src40/monreplication_root.res \ - admserv/cgi-src40/ugdsconfig_root.res admserv/cgi-src40/htmladmin_root.res \ - admserv/cgi-src40/restartsrv_root.res admserv/cgi-src40/viewdata_root.res \ - admserv/cgi-src40/sec-activate_root.res \ - admserv/cgi-src40/viewlog_root.res + properties/admpw/root.res \ + properties/security/root.res properties/config/root.res \ + properties/stopsrv/root.res \ + properties/dsconfig/root.res properties/monreplication/root.res \ + properties/ugdsconfig/root.res properties/htmladmin/root.res \ + properties/restartsrv/root.res properties/viewdata/root.res \ + properties/sec-activate/root.res properties/viewlog/root.res \ + properties/cgicommon/root.res MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT) # ICU resource file installation is handled specially @@ -392,8 +394,13 @@ # German resource bundles (for the German localization in the future) #RESOURCE_BUNDLES_DE = foo_de.res -%_root.res : %.properties - $(ICU_GENRB) -s. -d. --encoding 8859-1 --package-name $* $+ +properties/%/root.res : admserv/cgi-src40/%.properties + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+ + +%/root.res : %.properties + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+ %_fr.res : %_fr.properties $(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.45.2.2 retrieving revision 1.45.2.3 diff -u -r1.45.2.2 -r1.45.2.3 --- Makefile.in 15 Apr 2008 16:47:31 -0000 1.45.2.2 +++ Makefile.in 14 Jul 2008 20:58:45 -0000 1.45.2.3 @@ -93,20 +93,18 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \ "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \ - "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \ - "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \ + "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \ "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \ - "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" + "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libds_admin_serv_la_LIBADD = am__objects_1 = lib/base/file.lo lib/base/nscperror.lo \ lib/base/system.lo lib/base/nscputil.lo -am__objects_2 = lib/libsi18n/coreres.lo lib/libsi18n/getlang.lo \ - lib/libsi18n/getstrprop.lo lib/libsi18n/propset.lo \ - lib/libsi18n/reshash.lo lib/libsi18n/txtfile.lo +am__objects_2 = lib/libsi18n/getstrprop.lo am__objects_3 = lib/libadmin/cluster.lo lib/libadmin/dllglue.lo \ lib/libadmin/error.lo lib/libadmin/form_get.lo \ lib/libadmin/httpcon.lo lib/libadmin/install.lo \ @@ -202,11 +200,9 @@ cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) initSCRIPT_INSTALL = $(INSTALL_SCRIPT) -initconfigSCRIPT_INSTALL = $(INSTALL_SCRIPT) nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -perlSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) $(init_SCRIPTS) \ - $(initconfig_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS) + $(nodist_cmdbin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -258,13 +254,16 @@ dist_htmlDATA_INSTALL = $(INSTALL_DATA) dist_iconDATA_INSTALL = $(INSTALL_DATA) infDATA_INSTALL = $(INSTALL_DATA) +initconfigDATA_INSTALL = $(INSTALL_DATA) ldifDATA_INSTALL = $(INSTALL_DATA) nodist_configDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) +perlDATA_INSTALL = $(INSTALL_DATA) propertyDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_help_DATA) $(dist_html_DATA) $(dist_icon_DATA) \ - $(inf_DATA) $(ldif_DATA) $(nodist_config_DATA) \ - $(nodist_property_DATA) $(property_DATA) + $(inf_DATA) $(initconfig_DATA) $(ldif_DATA) \ + $(nodist_config_DATA) $(nodist_property_DATA) $(perl_DATA) \ + $(property_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = mod_admserv mod_restartd @@ -505,9 +504,7 @@ libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \ lib/base/system.cpp lib/base/nscputil.cpp -libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \ - lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c - +libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \ lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \ lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c @@ -542,7 +539,7 @@ @CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK) @CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK) init_SCRIPTS = wrappers/$(PACKAGE_NAME) -initconfig_SCRIPTS = admserv/cfgstuff/$(PACKAGE_NAME) +initconfig_DATA = admserv/cfgstuff/$(PACKAGE_NAME) ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/01nsroot.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ @@ -587,7 +584,7 @@ admserv/newinst/src/migrate-ds-admin.pl \ admserv/newinst/src/register-ds-admin.pl -perl_SCRIPTS = admserv/newinst/src/ASDialogs.pm \ +perl_DATA = admserv/newinst/src/ASDialogs.pm \ admserv/newinst/src/AdminUtil.pm \ admserv/newinst/src/AdminServer.pm \ admserv/newinst/src/ConfigDSDialogs.pm \ @@ -740,14 +737,14 @@ # This bundle must be always distributed and there is no need to have # *_en.properties resource bundle source files. RESOURCE_BUNDLES_ROOT = \ - admserv/cgi-src40/admpw_root.res \ - admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \ - admserv/cgi-src40/stopsrv_root.res \ - admserv/cgi-src40/dsconfig_root.res admserv/cgi-src40/monreplication_root.res \ - admserv/cgi-src40/ugdsconfig_root.res admserv/cgi-src40/htmladmin_root.res \ - admserv/cgi-src40/restartsrv_root.res admserv/cgi-src40/viewdata_root.res \ - admserv/cgi-src40/sec-activate_root.res \ - admserv/cgi-src40/viewlog_root.res + properties/admpw/root.res \ + properties/security/root.res properties/config/root.res \ + properties/stopsrv/root.res \ + properties/dsconfig/root.res properties/monreplication/root.res \ + properties/ugdsconfig/root.res properties/htmladmin/root.res \ + properties/restartsrv/root.res properties/viewdata/root.res \ + properties/sec-activate/root.res properties/viewlog/root.res \ + properties/cgicommon/root.res # ICU resource file installation is handled specially nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT) @@ -1005,18 +1002,8 @@ lib/libsi18n/$(DEPDIR)/$(am__dirstamp): @$(mkdir_p) lib/libsi18n/$(DEPDIR) @: > lib/libsi18n/$(DEPDIR)/$(am__dirstamp) -lib/libsi18n/coreres.lo: lib/libsi18n/$(am__dirstamp) \ - lib/libsi18n/$(DEPDIR)/$(am__dirstamp) -lib/libsi18n/getlang.lo: lib/libsi18n/$(am__dirstamp) \ - lib/libsi18n/$(DEPDIR)/$(am__dirstamp) lib/libsi18n/getstrprop.lo: lib/libsi18n/$(am__dirstamp) \ lib/libsi18n/$(DEPDIR)/$(am__dirstamp) -lib/libsi18n/propset.lo: lib/libsi18n/$(am__dirstamp) \ - lib/libsi18n/$(DEPDIR)/$(am__dirstamp) -lib/libsi18n/reshash.lo: lib/libsi18n/$(am__dirstamp) \ - lib/libsi18n/$(DEPDIR)/$(am__dirstamp) -lib/libsi18n/txtfile.lo: lib/libsi18n/$(am__dirstamp) \ - lib/libsi18n/$(DEPDIR)/$(am__dirstamp) lib/libadmin/$(am__dirstamp): @$(mkdir_p) lib/libadmin @: > lib/libadmin/$(am__dirstamp) @@ -1290,25 +1277,6 @@ echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \ rm -f "$(DESTDIR)$(initdir)/$$f"; \ done -install-initconfigSCRIPTS: $(initconfig_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)" - @list='$(initconfig_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(initconfigSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \ - $(initconfigSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \ - else :; fi; \ - done - -uninstall-initconfigSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(initconfig_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \ - done install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)" @@ -1328,25 +1296,6 @@ echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \ rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \ done -install-perlSCRIPTS: $(perl_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)" - @list='$(perl_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(perlSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \ - $(perlSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \ - else :; fi; \ - done - -uninstall-perlSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(perl_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ - rm -f "$(DESTDIR)$(perldir)/$$f"; \ - done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1412,18 +1361,8 @@ -rm -f lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT) -rm -f lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT) -rm -f lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT) - -rm -f lib/libsi18n/coreres.$(OBJEXT) - -rm -f lib/libsi18n/coreres.lo - -rm -f lib/libsi18n/getlang.$(OBJEXT) - -rm -f lib/libsi18n/getlang.lo -rm -f lib/libsi18n/getstrprop.$(OBJEXT) -rm -f lib/libsi18n/getstrprop.lo - -rm -f lib/libsi18n/propset.$(OBJEXT) - -rm -f lib/libsi18n/propset.lo - -rm -f lib/libsi18n/reshash.$(OBJEXT) - -rm -f lib/libsi18n/reshash.lo - -rm -f lib/libsi18n/txtfile.$(OBJEXT) - -rm -f lib/libsi18n/txtfile.lo distclean-compile: -rm -f *.tab.c @@ -1477,12 +1416,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_updown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/coreres.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getlang.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getstrprop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/propset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/reshash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/txtfile.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @@ -1864,6 +1798,23 @@ echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \ rm -f "$(DESTDIR)$(infdir)/$$f"; \ done +install-initconfigDATA: $(initconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(initconfigdir)" || $(mkdir_p) "$(DESTDIR)$(initconfigdir)" + @list='$(initconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(initconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(initconfigdir)/$$f'"; \ + $(initconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(initconfigdir)/$$f"; \ + done + +uninstall-initconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(initconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(initconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(initconfigdir)/$$f"; \ + done install-ldifDATA: $(ldif_DATA) @$(NORMAL_INSTALL) test -z "$(ldifdir)" || $(mkdir_p) "$(DESTDIR)$(ldifdir)" @@ -1915,6 +1866,23 @@ echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \ rm -f "$(DESTDIR)$(propertydir)/$$f"; \ done +install-perlDATA: $(perl_DATA) + @$(NORMAL_INSTALL) + test -z "$(perldir)" || $(mkdir_p) "$(DESTDIR)$(perldir)" + @list='$(perl_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(perlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perldir)/$$f'"; \ + $(perlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perldir)/$$f"; \ + done + +uninstall-perlDATA: + @$(NORMAL_UNINSTALL) + @list='$(perl_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ + rm -f "$(DESTDIR)$(perldir)/$$f"; \ + done install-propertyDATA: $(property_DATA) @$(NORMAL_INSTALL) test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" @@ -2213,7 +2181,7 @@ $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -2278,9 +2246,9 @@ install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \ install-cmdbinSCRIPTS install-dist_helpDATA \ install-dist_htmlDATA install-dist_iconDATA install-infDATA \ - install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \ + install-initSCRIPTS install-initconfigDATA install-ldifDATA \ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \ - install-nodist_propertyDATA install-perlSCRIPTS \ + install-nodist_propertyDATA install-perlDATA \ install-propertyDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -2317,10 +2285,10 @@ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ uninstall-dist_htmlDATA uninstall-dist_iconDATA \ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-ldifDATA \ + uninstall-initconfigDATA uninstall-ldifDATA \ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-perlDATA uninstall-propertyDATA uninstall-info: uninstall-info-recursive @@ -2337,10 +2305,10 @@ install-data-am install-data-hook install-dist_helpDATA \ install-dist_htmlDATA install-dist_iconDATA install-exec \ install-exec-am install-infDATA install-info install-info-am \ - install-initSCRIPTS install-initconfigSCRIPTS install-ldifDATA \ + install-initSCRIPTS install-initconfigDATA install-ldifDATA \ install-libLTLIBRARIES install-man \ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \ - install-nodist_propertyDATA install-perlSCRIPTS \ + install-nodist_propertyDATA install-perlDATA \ install-propertyDATA install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ @@ -2351,10 +2319,10 @@ uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \ uninstall-dist_htmlDATA uninstall-dist_iconDATA \ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \ - uninstall-initconfigSCRIPTS uninstall-ldifDATA \ + uninstall-initconfigDATA uninstall-ldifDATA \ uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ uninstall-nodist_configDATA uninstall-nodist_propertyDATA \ - uninstall-perlSCRIPTS uninstall-propertyDATA + uninstall-perlDATA uninstall-propertyDATA define NL \\n @@ -2362,15 +2330,18 @@ install-data-hook: @for file in $(RESOURCE_BUNDLES_ROOT) ; do \ - basefile=`basename $$file` ; \ - destfile=`basename $$file | sed -e s,_root,/root,` ; \ - destdir=`dirname $$destfile` ; \ - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$(DESTDIR)$(propertydir)/$$basefile' '$(DESTDIR)$(propertydir)/$$destfile'"; \ - $(mkdir_p) "$(DESTDIR)$(propertydir)/$$destdir" ; \ - mv "$(DESTDIR)$(propertydir)/$$basefile" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \ - cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en.res" || exit 1; \ - cp "$(DESTDIR)$(propertydir)/$$destfile" "$(DESTDIR)$(propertydir)/$$destdir/en_US.res" || exit 1; \ - done + progdir=`dirname $$file` ; \ + progname=`basename $$progdir` ; \ + destdir="$(DESTDIR)$(propertydir)/$$progname" ; \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \ + test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \ + cp "$$file" "$$destdir" || exit 1 ; \ + cp "$$file" "$$destdir/en.res" || exit 1 ; \ + cp "$$file" "$$destdir/en_US.res" || exit 1 ; \ + done +# the makefile creates this one, but there seems to be no way to tell it not +# to, so we have to remove it before it causes problems + rm -f $(DESTDIR)$(propertydir)/root.res # French resource bundles (for the French localization in the future) #RESOURCE_BUNDLES_FR = foo_fr.res @@ -2378,8 +2349,13 @@ # German resource bundles (for the German localization in the future) #RESOURCE_BUNDLES_DE = foo_de.res -%_root.res : %.properties - $(ICU_GENRB) -s. -d. --encoding 8859-1 --package-name $* $+ +properties/%/root.res : admserv/cgi-src40/%.properties + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+ + +%/root.res : %.properties + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+ %_fr.res : %_fr.properties $(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+

1 0

[Fedora-directory-commits] adminserver/include i18n.h,1.6,1.6.2.1
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/include Modified Files: Tag: Directory_Server_8_0_Branch i18n.h Log Message: remove obsolete code from 8.0 branch Index: i18n.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/i18n.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- i18n.h 9 May 2007 00:26:35 -0000 1.6 +++ i18n.h 14 Jul 2008 20:58:46 -0000 1.6.2.1 @@ -26,34 +26,6 @@ #include "base/systems.h" #include "libadminutil/resource.h" -typedef res_RESOURCE_TABLE RESOURCE_TABLE; -typedef res_RESOURCE_GLOBAL RESOURCE_GLOBAL; - -/*******************************************************************************/ - -/* - * In accordance with the recommendations in the - * "Fedora Coding Standard for Server Internationalization", - * the following aliases are defined for fprintf, et al., and - * these aliases should be used to clearly indicate the intended - * destination for output. - */ - -#define AdminFprintf fprintf -#define DebugFprintf fprintf - -#define ClientSprintf sprintf -#define AdminSprintf sprintf -#define DebugSprintf sprintf - -#define ClientFputs fputs -#define AdminFputs fputs -#define DebugFputs fputs - -/* more #define, as needed */ - -/*******************************************************************************/ - /* * Function prototypes for application and libraries */ @@ -64,16 +36,6 @@ { #endif -/***************************/ -/* XP_InitStringDatabase() */ -/***************************/ - -NSAPI_PUBLIC -void -XP_InitStringDatabase(char* pathCWD, char* databaseName); - -/* Initialize the resource string database */ - /******************************/ /* XP_GetStringFromDatabase() */ /******************************/ @@ -84,125 +46,10 @@ char* strLanguage, int iToken); -/* Given the LibraryName, Language and Token, extracts the string corresponding - to that library and token from the database in the language requested and - returns a pointer to the string. Note: Use the macros XP_GetClientStr() and - XP_GetAdminStr() defined below to simplify source code. */ - -/*****************/ -/* SetLanguage() */ -/*****************/ -enum -{ - CLIENT_LANGUAGE, - ADMIN_LANGUAGE, - DEFAULT_LANGUAGE -}; - -NSAPI_PUBLIC -extern void -SetLanguage(int type, char *language); - -/* Set language for Client, Admin and Default, XP_GetStringFromDatabase will - base on the setting to retrieve correct string for specific language */ - -/***********************/ -/* GetClientLanguage() */ -/***********************/ - -NSAPI_PUBLIC -extern char* -GetClientLanguage(void); - -/* Returns a pointer to a string with the name of the language requested by - the current client; intended to be passed to XP_GetStringFromDatabase() - and used by the front end macro XP_GetClientStr(). */ - -/**********************/ -/* GetAdminLanguage() */ -/**********************/ - -NSAPI_PUBLIC -extern char* -GetAdminLanguage(void); - -/* Returns a pointer to a string with the name of the language requested by - the administrator; intended to be passed to XP_GetStringFromDatabase() - and used by the front end macro XP_GetAdminStr(). */ - -/************************/ -/* GetDefaultLanguage() */ -/************************/ - -NSAPI_PUBLIC -extern char* -GetDefaultLanguage(void); - -/* Returns a pointer to a string with the name of the default language - for the installation from the configuration file. */ - -/************************/ -/* GetFileForLanguage() */ -/************************/ - -NSAPI_PUBLIC -int -GetFileForLanguage(char* filepath,char* language,char* existingFilepath, size_t existingSize); - -/* Looks for a file in the appropriate language. - - Input: filePath,language - filePath is of the form "/xxx/xxx/$$LANGDIR/xxx/xxx/filename" - or of the form "/xxx/xxx/xxx/xxx/filename". - filename may or may not have an extension. - language is an Accept-Language list; each language-range will be - tried as a subdirectory name and possibly as a filename modifier. - "*" is ignored - default always provided if needed. - "-" is replaced by "_". - $$LANGDIR is a special string replaced by language. It is optional. - For the default case, $$LANGDIR/ is replaced by nothing - (so // is not created). - - Returned: existingPath - existingFilePath is the path of a satisfactory, existing file. - if no file is found, an empty string "" is returned. - - int returned: -1 if no file found (existingFilePath = "") - 0 if default file is returned - 1 if language file is returned (any in list) */ - -/********************/ -/* XP_AccLangList() */ -/********************/ - -#define MAX_ACCEPT_LANGUAGE 16 -#define MAX_ACCEPT_LENGTH 18 - -NSAPI_PUBLIC -int -XP_AccLangList(char* AcceptLanguage, - ACCEPT_LANGUAGE_LIST AcceptLanguageList); - #ifdef __cplusplus } #endif - -/*******************************************************************************/ - -/* - * Function prototypes for building string database - */ - -extern int XP_MakeStringDatabase(void); - -/* Used to create the string database at build time; not used by the application - itself. Returns 0 is successful. */ - -extern void XP_PrintStringDatabase(void); - -/* DEBUG: Prints out entire string database to standard output. */ - /*******************************************************************************/ /* @@ -210,11 +57,6 @@ * (need one argument instead of three) */ -#define XP_GetClientStr(DBTTokenName) \ - XP_GetStringFromDatabase(LIBRARY_NAME, \ - GetClientLanguage(), \ - DBTTokenName) - #define XP_GetAdminStr(DBTTokenName) \ XP_GetStringFromDatabase(LIBRARY_NAME, \ "en", \ @@ -222,37 +64,4 @@ /*******************************************************************************/ - -/*******************************************************************************/ - -/* - * Define the ResDef macro to simplify the maintenance of strings which are to - * be added to the library or application header file (dbtxxx.h). This enables - * source code to refer to the strings by theit TokenNames, and allows the - * strings to be stored in the database. - * - * Usage: ResDef(TokenName,TokenValue,String) - * - * Example: ResDef(DBT_HelloWorld_, \ - * 1,"Hello, World!") - * ResDef(DBT_TheCowJumpedOverTheMoon_, \ - * 2,"The cow jumped over the moon.") - * ResDef(DBT_TheValueOfPiIsAbout31415926536_, \ - * 3,"The value of PI is about 3.1415926536." - * - * RESOURCE_STR is used by makstrdb.c only. It is not used by getstrdb.c or - * in library or application source code. - */ - -#if 0 -#define BEGIN_STR(argLibraryName) \ - enum { -#define ResDef(argToken,argID,argString) \ - argToken = argID, -#define END_STR(argLibraryName) \ - argLibraryName ## top }; - -#endif -/*******************************************************************************/ - #endif

1 0

[Fedora-directory-commits] adminserver/include/base buffer.h, 1.4, 1.4.2.1 util.h, 1.4, 1.4.2.1 dbtbase.h, 1.4, NONE
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/include/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9594/adminserver/include/base Modified Files: Tag: Directory_Server_8_0_Branch buffer.h util.h Removed Files: Tag: Directory_Server_8_0_Branch dbtbase.h Log Message: remove obsolete code from 8.0 branch Index: buffer.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/base/buffer.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- buffer.h 18 Aug 2005 19:14:43 -0000 1.4 +++ buffer.h 14 Jul 2008 20:58:46 -0000 1.4.2.1 @@ -91,14 +91,6 @@ filebuf_t *INTfilebuf_create(SYS_FILE fd, caddr_t mmap_ptr, int mmap_len, int bufsz); -/* - * filebuf_close_buffer is provided to cleanup a filebuf without closing - * the underlying file. If clean_mmap is 1, and the file is memory mapped, - * the file will be unmapped. If clean_mmap is 0, the file will not - * be unmapped. - */ -NSAPI_PUBLIC void INTfilebuf_close_buffer(filebuf_t *buf, int clean_mmap); - #ifdef FILE_MMAP #include <sys/stat.h> NSAPI_PUBLIC @@ -122,12 +114,6 @@ NSAPI_PUBLIC int INTpipebuf_next(filebuf_t *buf, int advance); #endif /* XP_WIN32 */ -/* - * buffer_close deallocates a buffer and closes its associated files - * (does not close a network socket). - */ - -NSAPI_PUBLIC void INTfilebuf_close(filebuf_t *buf); #ifdef XP_WIN32 NSAPI_PUBLIC void INTpipebuf_close(filebuf_t *buf); #endif /* XP_WIN32 */ @@ -178,7 +164,6 @@ #define filebuf_next INTfilebuf_next #define filebuf_grab INTfilebuf_grab #define filebuf_create INTfilebuf_create -#define filebuf_close_buffer INTfilebuf_close_buffer #define filebuf_buf2sd INTfilebuf_buf2sd #ifdef XP_WIN32 Index: util.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/base/util.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- util.h 9 May 2007 00:26:35 -0000 1.4 +++ util.h 14 Jul 2008 20:58:46 -0000 1.4.2.1 @@ -148,17 +148,6 @@ /* --- End Unix-only function prototypes --- */ -/* --- Begin Windows-only function prototypes --- */ - -#ifdef XP_WIN32 - -NSAPI_PUBLIC -VOID INTutil_delete_directory(char *FileName, BOOL delete_directory); - -#endif /* XP_WIN32 */ - -/* --- End Windows-only function prototypes --- */ - NSPR_END_EXTERN_C #define util_getline INTutil_getline @@ -203,10 +192,6 @@ #define util_waitpid INTutil_waitpid #endif /* XP_UNIX */ -#ifdef XP_WIN32 -#define util_delete_directory INTutil_delete_directory -#endif /* XP_WIN32 */ - #ifdef NEED_STRCASECMP #define util_strcasecmp INTutil_strcasecmp #define strcasecmp INTutil_strcasecmp --- dbtbase.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/libsi18n getstrprop.c, 1.4, 1.5 gsadmserv.h, 1.6, 1.7 coreres.c, 1.3, NONE coreres.h, 1.3, NONE getlang.c, 1.5, NONE lock.h, 1.3, NONE makstrdb.c, 1.4, NONE propset.c, 1.4, NONE propset.h, 1.3, NONE reshash.c, 1.3, NONE reshash.h, 1.3, NONE txtfile.c, 1.4, NONE txtfile.h, 1.3, NONE
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/libsi18n In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6632/adminserver/lib/libsi18n Modified Files: getstrprop.c gsadmserv.h Removed Files: coreres.c coreres.h getlang.c lock.h makstrdb.c propset.c propset.h reshash.c reshash.h txtfile.c txtfile.h Log Message: removing dead code Index: getstrprop.c =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libsi18n/getstrprop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- getstrprop.c 31 Mar 2006 22:58:34 -0000 1.4 +++ getstrprop.c 14 Jul 2008 20:34:43 -0000 1.5 @@ -27,71 +27,20 @@ #include "getstrmem.h" -#include "libadminutil/resource.h" -#include "coreres.h" - -Resource *hResource = NULL; -char empty_string[] = ""; - char* XP_GetStringFromMemory(char* strLibraryName,int iToken); - -void -XP_InitStringDatabase(char* pathCWD, char* databaseName) -{ - hResource = core_res_init_resource (pathCWD, databaseName); -} - -char *XP_GetPropertyString(char* strLibraryName,int iToken, ACCEPT_LANGUAGE_LIST lang) -{ - char *key_name; - char *result = NULL; - - if (hResource == NULL) - return NULL; - - /*creating the key*/ - key_name=(char*)malloc(strlen(strLibraryName) + 10); - sprintf(key_name, "%s-%d", strLibraryName, iToken); - if(key_name == NULL) - return NULL; - - result = (char *) core_res_getstring(hResource, key_name, lang) ; - - if (key_name) - free (key_name); - - if (result == NULL) - return empty_string; - else - return result ; -} - char* XP_GetStringFromDatabase(char* strLibraryName, char* strLanguage, int key) { char *result = NULL; - ACCEPT_LANGUAGE_LIST alanglist; - int n; - /* - * display first choice language if available, otherwise - * use default which is english in most case - */ - if (hResource) { - n = XP_AccLangList (strLanguage, alanglist); - if (n >= MAX_ACCEPT_LANGUAGE) - alanglist[MAX_ACCEPT_LANGUAGE-1][0] = '\0'; - else - alanglist[n][0] = '\0'; - result = XP_GetPropertyString(strLibraryName, key, alanglist); - } - - /* we should never come here. */ + /* we should eventually port this to use proper adminutil + resources, but for now, only the in-memory resource + model is supported */ if (result == NULL) result = XP_GetStringFromMemory(strLibraryName,key); return result; @@ -150,115 +99,3 @@ } } - -#if 0 -#include "base/crit.h" -#include "base/systhr.h" -static int Initialized = 0; - -#ifdef XP_UNIX - -#include <sys/types.h> -#include <sys/ipc.h> -#include <sys/sem.h> -#include <unistd.h> - -union _semarg -{ - int val; - struct semid_ds *buf; - ushort *array; -}; - -int _si18n_semMutex; -pid_t _lockOwner = 0; -int _si18n_waitQueue; -struct sembuf _semop_p[1] = {0,-1,0}; -struct sembuf _semop_v[1] = {0,1,0}; - - -void _si18n_lock(MutexPointer p) -{ - pid_t current_pid = getpid(); - - semop(*((int*)p),_semop_p,1); - if (current_pid != _lockOwner) - { - semop(*((int*)p),_semop_v,1); - semop(_si18n_waitQueue,_semop_p,1); /* wait for access */ - semop(*((int*)p),_semop_p,1); - _lockOwner = current_pid; - } - - semop(*((int*)p),_semop_v,1); - -} - -void _si18n_unlock(MutexPointer p) -{ - semop(*((int*)p),_semop_p,1); - - _lockOwner = 0; - semop(_si18n_waitQueue,_semop_v,1); /* signal one waiter */ - - semop(*((int*)p),_semop_v,1); - -} - -MutexImplementation _nlsMutexImplementation = -{ - &_si18n_semMutex, - _si18n_lock, - _si18n_unlock -}; - -MutexImplementation* _pMutexImplementation = &_nlsMutexImplementation; - - -void InitSynchronization(void) -{ - union _semarg val; - - val.val = 1; /* to avoid an aligment fault on certain platforms */ - - _si18n_semMutex = semget(IPC_PRIVATE,1,IPC_CREAT | 0600); - _si18n_waitQueue = semget(IPC_PRIVATE,1,IPC_CREAT | 0600); - - semctl(_si18n_semMutex,0,SETVAL,val); - semctl(_si18n_waitQueue,0,SETVAL,val); -} - -#else -#include "lock.h" -#include <windows.h> - -static CRITICAL_SECTION _csMutex; - -void _lock(MutexPointer p) -{ - EnterCriticalSection((CRITICAL_SECTION*)p); -} - -void _unlock(MutexPointer p) -{ - LeaveCriticalSection((CRITICAL_SECTION*)p); -} - -MutexImplementation _nlsMutexImplementation = -{ - &_csMutex, - _lock, - _unlock -}; - -MutexImplementation* _pMutexImplementation = &_nlsMutexImplementation; - -void InitSynchronization(void) -{ - InitializeCriticalSection(&_csMutex); -} - -#endif - -#endif - Index: gsadmserv.h =================================================================== RCS file: /cvs/dirsec/adminserver/lib/libsi18n/gsadmserv.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gsadmserv.h 18 Jul 2007 22:10:31 -0000 1.6 +++ gsadmserv.h 14 Jul 2008 20:34:43 -0000 1.7 @@ -26,13 +26,10 @@ #undef LIBRARY_NAME #include "../admserv/cgi-src40/dbtcgiadmin.h" #undef LIBRARY_NAME -#include "base/dbtbase.h" -#undef LIBRARY_NAME #include "libadmin/dbtlibadmin.h" -static RESOURCE_GLOBAL allxpstr[] = { +static res_RESOURCE_GLOBAL allxpstr[] = { admserv, - base, 0 }; --- coreres.c DELETED --- --- coreres.h DELETED --- --- getlang.c DELETED --- --- lock.h DELETED --- --- makstrdb.c DELETED --- --- propset.c DELETED --- --- propset.h DELETED --- --- reshash.c DELETED --- --- reshash.h DELETED --- --- txtfile.c DELETED --- --- txtfile.h DELETED ---

1 0

[Fedora-directory-commits] adminserver/lib/base nscputil.cpp, 1.3, 1.4 buffer.cpp, 1.4, NONE eventhandler.cpp, 1.3, NONE eventlog.cpp, 1.3, NONE ntdaemon.cpp, 1.3, NONE nterrors.cpp, 1.3, NONE ntpipe.cpp, 1.3, NONE
by Doctor Conrad 14 Jul '08

14 Jul '08

Author: rmeggins Update of /cvs/dirsec/adminserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6632/adminserver/lib/base Modified Files: nscputil.cpp Removed Files: buffer.cpp eventhandler.cpp eventlog.cpp ntdaemon.cpp nterrors.cpp ntpipe.cpp Log Message: removing dead code Index: nscputil.cpp =================================================================== RCS file: /cvs/dirsec/adminserver/lib/base/nscputil.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nscputil.cpp 22 Jun 2007 01:34:20 -0000 1.3 +++ nscputil.cpp 14 Jul 2008 20:34:43 -0000 1.4 @@ -44,9 +44,6 @@ #include "base/util.h" -#include "base/dbtbase.h" - - #ifdef XP_UNIX #include <sys/types.h> #endif /* WIN32 */ @@ -850,66 +847,6 @@ } #endif /* NEED_STRNCASECMP */ -#ifdef XP_WIN32 - - -/* util_delete_directory() - * This routine deletes all the files in a directory. If delete_directory is - * TRUE it will also delete the directory itself. - */ -VOID -util_delete_directory(char *FileName, BOOL delete_directory) -{ - HANDLE firstFile; - WIN32_FIND_DATA findData; - char *TmpFile, *NewFile; - - if (FileName == NULL) - return; - - TmpFile = (char *)MALLOC(strlen(FileName) + 5); - sprintf(TmpFile, "%s\\*.*", FileName); - firstFile = FindFirstFile(TmpFile, &findData); - FREE(TmpFile); - - if (firstFile == INVALID_HANDLE_VALUE) - return; - - if(strcmp(findData.cFileName, ".") && - strcmp(findData.cFileName, "..")) { - NewFile = (char *)MALLOC(strlen(FileName) + 1 + - strlen(findData.cFileName) + 1); - sprintf(NewFile, "%s\\%s",FileName, findData.cFileName); - DeleteFile(NewFile); - FREE(NewFile); - } - while (TRUE) { - if(!(FindNextFile(firstFile, &findData))) { - if (GetLastError() != ERROR_NO_MORE_FILES) { -// ereport(LOG_WARN, XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_), FileName, GetLastError()); - } else { - FindClose(firstFile); - if (delete_directory) - if(!RemoveDirectory(FileName)) { -// ereport(LOG_WARN, - XP_GetAdminStr(DBT_couldNotRemoveTemporaryDirectory_1), - FileName, GetLastError()); - } - return; - } - } else { - if(strcmp(findData.cFileName, ".") && - strcmp(findData.cFileName, "..")) { - NewFile = (char *)MALLOC(strlen(FileName) + 5 + - strlen(findData.cFileName) + 1); - sprintf(NewFile,"%s\\%s", FileName, findData.cFileName); - DeleteFile(NewFile); - FREE(NewFile); - } - } - } -} -#endif /* ------------------------------ util_strftime --------------------------- */ /* --- buffer.cpp DELETED --- --- eventhandler.cpp DELETED --- --- eventlog.cpp DELETED --- --- ntdaemon.cpp DELETED --- --- nterrors.cpp DELETED --- --- ntpipe.cpp DELETED ---

1 0

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits July 2008