Author: rmeggins
Update of /cvs/dirsec/adminutil/lib/libadminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/adminutil/lib/libadminutil
Modified Files:
distadm.c
Log Message:
change binary directory naming convention to the same one we use with pre-built binary
components; remove old crufty Fortezza stuff; general makefile cleanup
Index: distadm.c
===================================================================
RCS file: /cvs/dirsec/adminutil/lib/libadminutil/distadm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- distadm.c 20 Jul 2005 22:51:32 -0000 1.1.1.1
+++ distadm.c 29 Sep 2005 22:10:15 -0000 1.2
@@ -141,9 +141,6 @@
static char *pass = ADM_NOT_INITIALIZED;
static char *auth = ADM_NOT_INITIALIZED;
static char *userDN = ADM_NOT_INITIALIZED;
-#ifdef FORTEZZA
-static char *pin = ADM_NOT_INITIALIZED;
-#endif /* FORTEZZA */
/* The function to use when reading the stuff from the pipe */
#ifdef XP_WIN32
@@ -250,18 +247,6 @@
}
}
-#ifdef FORTEZZA
- head = tail;
- tail = PL_strchr(head, '\n');
- *tail++ = '\0';
- if(!PL_strncmp(head, ADM_PIN_STRING, PL_strlen(ADM_PIN_STRING))) {
- pin = PL_strdup(&(head[PL_strlen(ADM_PIN_STRING)]));
- if(!PL_strcmp(pin, ADM_NO_VALUE_STRING)) {
- pin = NULL;
- }
- }
-#endif /* FORTEZZA */
-
head = tail;
tail = PL_strchr(head, '\n');
*tail++ = '\0';
@@ -348,20 +333,3 @@
*userdn = userDN;
return 0;
}
-
-#ifdef FORTEZZA
-PR_IMPLEMENT(int)
-ADM_GetPinString(int *errcode, char **pinstr)
-{
- int err;
-
- if((pin) && (!PL_strcmp(pin, ADM_NOT_INITIALIZED))) {
- if(ADM_InitializePermissions(&err)) {
- *errcode = err;
- return -1;
- }
- }
- *pinstr = pin;
- return 0;
-}
-#endif /* FORTEZZA */
Show replies by date