[Fedora-directory-commits] ldapserver/include i18n.h, 1.5, 1.6 netsite.h, 1.5, 1.6 version.h, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include
Modified Files:
i18n.h netsite.h version.h
Log Message:
Resolves: #214533
Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
Index: i18n.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/i18n.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- i18n.h 19 Apr 2005 22:06:43 -0000 1.5
+++ i18n.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#ifndef I18N_H
#define I18N_H
Index: netsite.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/netsite.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- netsite.h 19 Apr 2005 22:06:43 -0000 1.5
+++ netsite.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef NETSITE_H
#define NETSITE_H
Index: version.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/version.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- version.h 3 Nov 2006 21:15:31 -0000 1.11
+++ version.h 10 Nov 2006 23:44:24 -0000 1.12
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
This file is included from both C source and the NT installation compiler.
Because of that, no ifdefs are allowed, and strings must be simple strings
17 years, 5 months
[Fedora-directory-commits] ldapserver/include/base crit.h, 1.6, 1.7 dbtbase.h, 1.5, 1.6 ereport.h, 1.7, 1.8 eventhandler.h, 1.4, 1.5 eventlog.h, 1.4, 1.5 file.h, 1.5, 1.6 fsmutex.h, 1.4, 1.5 lexer.h, 1.4, 1.5 nterr.h, 1.4, 1.5 nterrors.h, 1.4, 1.5 plist.h, 1.4, 1.5 pool.h, 1.6, 1.7 rwlock.h, 1.4, 1.5 shexp.h, 1.5, 1.6 systems.h, 1.7, 1.8 systhr.h, 1.5, 1.6 util.h, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/include/base
Modified Files:
crit.h dbtbase.h ereport.h eventhandler.h eventlog.h file.h
fsmutex.h lexer.h nterr.h nterrors.h plist.h pool.h rwlock.h
shexp.h systems.h systhr.h util.h
Log Message:
Resolves: #214533
Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
Index: crit.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/crit.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crit.h 19 Apr 2005 22:06:44 -0000 1.6
+++ crit.h 10 Nov 2006 23:44:23 -0000 1.7
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_CRIT_H
#define BASE_CRIT_H
Index: dbtbase.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/dbtbase.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbtbase.h 19 Apr 2005 22:06:44 -0000 1.5
+++ dbtbase.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -36,6 +36,11 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
#define LIBRARY_NAME "base"
static char dbtbaseid[] = "$DBT: base referenced v1 $";
Index: ereport.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/ereport.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ereport.h 11 Apr 2006 02:14:26 -0000 1.7
+++ ereport.h 10 Nov 2006 23:44:24 -0000 1.8
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_EREPORT_H
#define BASE_EREPORT_H
Index: eventhandler.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/eventhandler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eventhandler.h 19 Apr 2005 22:06:44 -0000 1.4
+++ eventhandler.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
* eventhandler.h: Handle registration of event handlers
*
Index: eventlog.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/eventlog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eventlog.h 19 Apr 2005 22:06:44 -0000 1.4
+++ eventlog.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
// EVENTLOG.H
//
// This file contains the defines that make NT an installable service.
Index: file.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/file.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- file.h 19 Apr 2005 22:06:44 -0000 1.5
+++ file.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_FILE_H
#define BASE_FILE_H
Index: fsmutex.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/fsmutex.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fsmutex.h 19 Apr 2005 22:06:44 -0000 1.4
+++ fsmutex.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
* fsmutex: Mutexes that are filesystem-based so they're available from more
* than one process and address space
Index: lexer.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/lexer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lexer.h 19 Apr 2005 22:06:44 -0000 1.4
+++ lexer.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef __lexer_h
#define __lexer_h
Index: nterr.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/nterr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nterr.h 19 Apr 2005 22:06:44 -0000 1.4
+++ nterr.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
* Added function prototypes for nterror stuff.
*
Index: nterrors.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/nterrors.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nterrors.h 19 Apr 2005 22:06:44 -0000 1.4
+++ nterrors.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/* DO NOT EDIT THIS FILE - it is automatically generated */
typedef struct _NtError {
Index: plist.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/plist.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plist.h 19 Apr 2005 22:06:44 -0000 1.4
+++ plist.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef _PLIST_H
#define _PLIST_H
Index: pool.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/pool.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pool.h 19 Apr 2005 22:06:44 -0000 1.6
+++ pool.h 10 Nov 2006 23:44:24 -0000 1.7
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_POOL_H
#define BASE_POOL_H
Index: rwlock.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/rwlock.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rwlock.h 19 Apr 2005 22:06:44 -0000 1.4
+++ rwlock.h 10 Nov 2006 23:44:24 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
* rwlock.h: Shared/Exclusive lock abstraction.
*
Index: shexp.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/shexp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shexp.h 19 Apr 2005 22:06:44 -0000 1.5
+++ shexp.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_SHEXP_H
#define BASE_SHEXP_H
Index: systems.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/systems.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- systems.h 10 Nov 2006 01:42:37 -0000 1.7
+++ systems.h 10 Nov 2006 23:44:24 -0000 1.8
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_SYSTEMS_H
#define BASE_SYSTEMS_H
Index: systhr.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/systhr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- systhr.h 19 Apr 2005 22:06:44 -0000 1.5
+++ systhr.h 10 Nov 2006 23:44:24 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_SYSTHR_H
#define BASE_SYSTHR_H
Index: util.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/util.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util.h 11 Apr 2006 02:14:26 -0000 1.7
+++ util.h 10 Nov 2006 23:44:24 -0000 1.8
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef BASE_UTIL_H
#define BASE_UTIL_H
17 years, 5 months
[Fedora-directory-commits] ldapserver/httpd/src ntnsapi.c,1.9,1.10
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/httpd/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/httpd/src
Modified Files:
ntnsapi.c
Log Message:
Resolves: #214533
Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
Index: ntnsapi.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/httpd/src/ntnsapi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ntnsapi.c 10 Nov 2006 01:10:43 -0000 1.9
+++ ntnsapi.c 10 Nov 2006 23:44:21 -0000 1.10
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
* Aruna Victor
* NT NSAPI works differently from UNIX. The DLL doesn't know the addresses
17 years, 5 months
[Fedora-directory-commits] ldapserver/config nsinstall.c, 1.5, 1.6 pathsub.c, 1.4, 1.5 pathsub.h, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30269/config
Modified Files:
nsinstall.c pathsub.c pathsub.h
Log Message:
Resolves: #214533
Summary: configure needs to support --with-fhs (Comment #6)
Changes: Added the following include next to the end of the copyright block.
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
Index: nsinstall.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/nsinstall.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsinstall.c 19 Apr 2005 22:06:42 -0000 1.5
+++ nsinstall.c 10 Nov 2006 23:44:20 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
** install command.
**
Index: pathsub.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/pathsub.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pathsub.c 19 Apr 2005 22:06:42 -0000 1.4
+++ pathsub.c 10 Nov 2006 23:44:20 -0000 1.5
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
/*
** Pathname subroutines.
**
Index: pathsub.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/config/pathsub.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pathsub.h 11 Apr 2006 02:14:25 -0000 1.5
+++ pathsub.h 10 Nov 2006 23:44:20 -0000 1.6
@@ -35,6 +35,11 @@
* Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifndef pathsub_h___
#define pathsub_h___
/*
17 years, 5 months
[Fedora-directory-commits] coolkey/src/coolkey slot.cpp, 1.2, 1.3 log.h, 1.1, 1.2
by Doctor Conrad
Author: rrelyea
Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11789
Modified Files:
slot.cpp log.h
Log Message:
Add syslog support.
Add CAC support
Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slot.cpp 25 Jul 2006 23:37:11 -0000 1.2
+++ slot.cpp 10 Nov 2006 19:08:07 -0000 1.3
@@ -585,16 +585,41 @@
}
Transaction trans;
- trans.begin(conn);
+ status = trans.begin(conn);
+
+ /* CAC card are cranky after they are first inserted.
+ * don't continue until we can convince the tranaction to work */
+ for (int count = 0; count < 10 && status == CKYSCARDERR
+ && CKYCardConnection_GetLastError(conn) == SCARD_W_RESET_CARD; count++) {
+ log->log("CAC Card Reset detected retry %d: time %d ms\n", count,
+ OSTimeNow() - time);
+ CKYCardConnection_Disconnect(conn);
+ OSSleep(100000); /* 100 ms */
+ status = CKYCardConnection_Connect(conn, readerName);
+ if (status != CKYSUCCESS) {
+ continue;
+ }
+ status = trans.begin(conn);
+ }
+
+ /* Can't get a transaction, give up */
+ if (status != CKYSUCCESS) {
+ log->log("Transaction Failed 0x%x\n", status);
+ handleConnectionError();
+ }
// see if the applet is selectable
log->log("time connnect: Begin transaction %d ms\n", OSTimeNow() - time);
status = CKYApplet_SelectCoolKeyManager(conn, NULL);
if (status != CKYSUCCESS) {
+ log->log("CoolKey Select failed 0x%x\n", status);
status = CACApplet_SelectPKI(conn, 0, NULL);
if (status != CKYSUCCESS) {
+ log->log("CAC Select failed 0x%x\n", status);
if (status == CKYSCARDERR) {
+ log->log("CAC Card Failure 0x%x\n",
+ CKYCardConnection_GetLastError(conn));
disconnect();
}
return;
@@ -1121,6 +1146,8 @@
{
long error = CKYCardConnection_GetLastError(conn);
+ log->log("Connection Error = 0x%x\n", error);
+
// Force a reconnect after a token operation fails. The most
// common reason for it to fail is that it has been removed, but
// it doesn't hurt to do it in other cases either (such as a reset).
@@ -1966,7 +1993,7 @@
Slot::loadCACCert(CKYByte instance)
{
CKYISOStatus apduRC;
- CKYStatus status;
+ CKYStatus status = CKYSUCCESS;
CKYBuffer cert;
CKYBuffer rawCert;
CKYBuffer shmCert;
Index: log.h
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/log.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log.h 9 Jun 2006 18:39:11 -0000 1.1
+++ log.h 10 Nov 2006 19:08:07 -0000 1.2
@@ -53,4 +53,14 @@
virtual ~FileLog();
};
+class SysLog : public Log {
+ private:
+ SysLog(SysLog &) {}
+ SysLog * operator=(SysLog &) { return *this; }
+ public:
+ SysLog() { }
+ void log(const char *msg, ...);
+ virtual ~SysLog() { }
+};
+
#endif
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.69,1.70
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7046
Modified Files:
Makefile
Log Message:
Package libsasl in core libdir for old style build
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Makefile 7 Nov 2006 04:20:13 -0000 1.69
+++ Makefile 10 Nov 2006 18:12:01 -0000 1.70
@@ -570,6 +570,7 @@
# if not Linux, we need package sasl library and supported plugins
ifneq ($(ARCH), Linux)
$(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)
+ $(INSTALL) -m 755 $(SASL_LIBPATH)/*.$(DLL_SUFFIX)* $(RELDIR)/$(CORE_LIBDIR)
-mkdir $(DS_LIBDIR)/sasl2
$(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libdigestmd5.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
$(INSTALL) -m 755 $(SASL_LIBPATH)/sasl2/libgssapiv2.$(DLL_SUFFIX)* $(RELDIR)/$(DS_LIBDIR)/sasl2
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22953
Modified Files:
ds_newinst.pl
Log Message:
Bug: 214733
Description: be able to pass in all configurable paths to ds_newinst
Fix Description: There were a couple of other minor problems with ds_newinst.pl
1) Should only set cgi parameters for those items which have a value
2) Should not setenv NETSITE_ROOT - this overrides prefix settings
3) Should not set prefix here - it is set elsewhere
Index: ds_newinst.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ds_newinst.pl 9 Nov 2006 15:41:40 -0000 1.10
+++ ds_newinst.pl 10 Nov 2006 04:24:25 -0000 1.11
@@ -53,6 +53,7 @@
my $content = "";
my $firsttime = 1;
while (my ($kk, $vv) = each %{$args}) {
+ next if (!$kk || !$vv);
if ($firsttime) {
$firsttime = 0;
} else {
@@ -73,7 +74,6 @@
# setup CGI environment
$ENV{REQUEST_METHOD} = "POST";
- $ENV{NETSITE_ROOT} = $sroot;
$ENV{CONTENT_LENGTH} = $length;
$ENV{SERVER_NAMES} = 'slapd-' . $args->{servid};
@@ -179,7 +179,6 @@
# the following items are optional
-$cgiargs{"prefix"} = $table{"slapd"}->{"prefix"};
$cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"};
$cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"};
$cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"};
17 years, 5 months
[Fedora-directory-commits] ldapserver Makefile.am, 1.10, 1.11 Makefile.in, 1.11, 1.12
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13243
Modified Files:
Makefile.am Makefile.in
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macros(Comment #24)
NS_DS, NET_SSL, DUPGRADEDB, NSPR20, LDAPDB_THREAD_SAFE, CLIENT_AUTH,
MCC_HTTPD, NS_DOMESTIC, SPAPI20, SERVER_BUILD
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 3 Nov 2006 22:33:15 -0000 1.10
+++ Makefile.am 10 Nov 2006 01:50:11 -0000 1.11
@@ -7,10 +7,7 @@
BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
PLATFORM_DEFINES = @platform_defs@
DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \
- -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \
- -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \
- -DBUILD_NUM=$(BUILDNUM)
+DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM)
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES)
PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 3 Nov 2006 22:33:15 -0000 1.11
+++ Makefile.in 10 Nov 2006 01:50:11 -0000 1.12
@@ -911,11 +911,7 @@
BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
PLATFORM_DEFINES = @platform_defs@
DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \
- -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \
- -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \
- -DBUILD_NUM=$(BUILDNUM)
-
+DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM)
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES)
PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
@@ -8964,7 +8960,7 @@
./makstrdb
%: %.in
- mkdir -p $(dir $@)
+ mkdir -p $(dir $@)
$(fixupcmd) $^ > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd saslbind.c, 1.19, 1.20 sasl_io.c, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13201/ldap/servers/slapd
Modified Files:
saslbind.c sasl_io.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro CYRUS_SASL and BUILD_GSSAPI (Comment #23)
Index: saslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/saslbind.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- saslbind.c 7 Nov 2006 04:42:55 -0000 1.19
+++ saslbind.c 10 Nov 2006 01:46:59 -0000 1.20
@@ -36,24 +36,14 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
-#define CYRUS_SASL 1
-
#include <slap.h>
#include <fe.h>
#include <sasl.h>
#include <saslplug.h>
-#ifndef CYRUS_SASL
-#include <saslmod.h>
-#endif
#ifndef _WIN32
#include <unistd.h>
#endif
-/* No GSSAPI on Windows */
-#if !defined(_WIN32)
-#define BUILD_GSSAPI 1
-#endif
-
static char *serverfqdn;
/*
@@ -427,14 +417,8 @@
sasl_conn_t *conn,
void *context,
const char *userbuf, unsigned ulen,
-#ifndef CYRUS_SASL
- const char *authidbuf, unsigned alen,
-#endif
unsigned flags, const char *user_realm,
char *out_user, unsigned out_umax, unsigned *out_ulen
-#ifndef CYRUS_SASL
- ,char *out_authid, unsigned out_amax, unsigned *out_alen
-#endif
)
{
struct propctx *propctx = sasl_auxprop_getctx(conn);
@@ -442,9 +426,6 @@
Slapi_DN *sdn = NULL;
char *pw = NULL;
char *user = NULL;
-#ifndef CYRUS_SASL
- char *authid = NULL;
-#endif
const char *dn;
int isroot = 0;
char *clear = NULL;
@@ -454,17 +435,9 @@
if (user == NULL) {
goto fail;
}
-#ifdef CYRUS_SASL
LDAPDebug(LDAP_DEBUG_TRACE,
"ids_sasl_canon_user(user=%s, realm=%s)\n",
user, user_realm ? user_realm : "", 0);
-#else
- authid = buf2str(authidbuf, alen);
-
- LDAPDebug(LDAP_DEBUG_TRACE,
- "ids_sasl_canon_user(user=%s, authzid=%s, realm=%s)\n",
- user, authid, user_realm ? user_realm : "");
-#endif
if (strncasecmp(user, "dn:", 3) == 0) {
sdn = slapi_sdn_new();
@@ -480,11 +453,9 @@
/* map the sasl username into an entry */
entry = ids_sasl_user_to_entry(conn, context, user, user_realm);
if (entry == NULL) {
-#ifdef CYRUS_SASL
/* Specific return value is supposed to be set instead of
an generic error (SASL_FAIL) for Cyrus SASL */
returnvalue = SASL_NOAUTHZ;
-#endif
goto fail;
}
dn = slapi_entry_get_ndn(entry);
@@ -515,22 +486,8 @@
/* TODO: canonicalize */
PL_strncpyz(out_user, dn, out_umax);
-#ifdef CYRUS_SASL
/* the length of out_user needs to be set for Cyrus SASL */
*out_ulen = strlen(out_user);
-#else
- if (authid )
- {
- int offset = 0;
- /* The authid can start with dn:. In such case remove it */
- if (strncasecmp(authid,"dn:",3) == 0 )
- offset = 3;
- PL_strncpyz(out_authid, authid+offset, out_amax);
- }
- *out_ulen = -1;
- *out_alen = -1;
- slapi_ch_free((void**)&authid);
-#endif
slapi_entry_free(entry);
slapi_ch_free((void**)&user);
@@ -542,16 +499,12 @@
fail:
slapi_entry_free(entry);
slapi_ch_free((void**)&user);
-#ifndef CYRUS_SASL
- slapi_ch_free((void**)&authid);
-#endif
slapi_ch_free((void**)&pw);
slapi_sdn_free(&sdn);
return returnvalue;
}
-#ifdef CYRUS_SASL
static int ids_sasl_getpluginpath(sasl_conn_t *conn, const char **path)
{
/* Try to get path from config, otherwise check for SASL_PATH environment
@@ -566,7 +519,6 @@
*path = pluginpath;
return SASL_OK;
}
-#endif
static sasl_callback_t ids_sasl_callbacks[] =
{
@@ -586,21 +538,15 @@
NULL
},
{
-#ifdef CYRUS_SASL
SASL_CB_CANON_USER,
-#else
- SASL_CB_SERVER_CANON_USER,
-#endif
(IFP) ids_sasl_canon_user,
NULL
},
-#ifdef CYRUS_SASL
{
SASL_CB_GETPATH,
(IFP) ids_sasl_getpluginpath,
NULL
},
-#endif
{
SASL_CB_LIST_END,
(IFP) NULL,
@@ -636,25 +582,6 @@
return result;
}
-#ifndef CYRUS_SASL
- result = sasl_server_add_plugin("USERDB", sasl_userdb_init);
-
- if (result != SASL_OK) {
- LDAPDebug(LDAP_DEBUG_TRACE, "failed to add LDAP sasl plugin\n",
- 0, 0, 0);
- return result;
- }
-
-#if defined(BUILD_GSSAPI)
- result = sasl_server_add_plugin("GSSAPI", sasl_gssapi_init);
-
- if (result != SASL_OK) {
- LDAPDebug(LDAP_DEBUG_TRACE, "failed to add LDAP gssapi plugin\n",
- 0, 0, 0);
- }
-#endif
-#endif
-
result = sasl_auxprop_add_plugin("iDS", ids_auxprop_plug_init);
LDAPDebug( LDAP_DEBUG_TRACE, "<= ids_sasl_init\n", 0, 0, 0 );
Index: sasl_io.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sasl_io.c 26 Sep 2006 22:08:17 -0000 1.8
+++ sasl_io.c 10 Nov 2006 01:46:59 -0000 1.9
@@ -35,8 +35,6 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
-#define CYRUS_SASL 1
-
#include "slap.h"
#include "slapi-plugin.h"
#include "fe.h"
@@ -201,7 +199,6 @@
return -1;
}
-#ifdef CYRUS_SASL
if (ret == sizeof(buffer)) {
/* Decode the length (could use ntohl here ??) */
packet_length = buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3];
@@ -217,17 +214,6 @@
c->c_sasl_io_private->encrypted_buffer_count = packet_length;
c->c_sasl_io_private->encrypted_buffer_offset = 4;
}
-#else
- if (ret == sizeof(buffer)) {
- /* Decode the length (could use ntohl here ??) */
- packet_length = buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3];
- LDAPDebug( LDAP_DEBUG_CONNS,
- "read sasl packet length %ld on connection %d\n", packet_length, c->c_connid, 0 );
- sasl_io_resize_encrypted_buffer(c->c_sasl_io_private, packet_length);
- c->c_sasl_io_private->encrypted_buffer_count = packet_length;
- c->c_sasl_io_private->encrypted_buffer_offset = 0;
- }
-#endif
return 0;
}
static int
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsgw Versiongw.c, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/ldap/clients/dsgw
Modified Files:
Versiongw.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro MCC_HTTPD (Comment #14)
Index: Versiongw.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Versiongw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Versiongw.c 9 Oct 2006 20:38:37 -0000 1.5
+++ Versiongw.c 10 Nov 2006 01:42:38 -0000 1.6
@@ -36,10 +36,6 @@
* All rights reserved.
--- END COPYRIGHT BLOCK --- */
-#if defined( XP_WIN32 )
-#undef MCC_HTTPD
-#endif
-
#include "netsite.h" /* to get MAGNUS_VERSION_STRING */
#ifdef MAGNUS_VERSION_STRING
17 years, 5 months