[asterisk-commits] branch oej/res_config_ldap r18605 - /team/oej/res_config_ldap/res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Apr  9 13:56:48 2006
New Revision: 18605

URL: http://svn.digium.com/view/asterisk?rev=18605&view=rev
Log:
Update to new module system

Modified:
    team/oej/res_config_ldap/res/Makefile
    team/oej/res_config_ldap/res/res_config_ldap.c

Modified: team/oej/res_config_ldap/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/res_config_ldap/res/Makefile?rev=18605&r1=18604&r2=18605&view=diff
==============================================================================
--- team/oej/res_config_ldap/res/Makefile (original)
+++ team/oej/res_config_ldap/res/Makefile Sun Apr  9 13:56:48 2006
@@ -173,16 +173,12 @@
 res_snmp.so: res_snmp.o snmp/agent.o
 	$(CC) $(SOLINK) ${SNMP_LDFLAGS} -o $@ ${CYGSOLINK} res_snmp.o snmp/agent.o ${CYGSOLIB} ${SNMP_LDLIBS}
 
-<<<<<<< .working
 res_config_ldap.so: res_config_ldap.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lldap
 
-
-=======
 res_config_pgsql.so: res_config_pgsql.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lpq -lz $(MLFLAGS)
 
->>>>>>> .merge-right.r17628
 ifneq ($(wildcard .depend),)
   include .depend
 endif

Modified: team/oej/res_config_ldap/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/team/oej/res_config_ldap/res/res_config_ldap.c?rev=18605&r1=18604&r2=18605&view=diff
==============================================================================
--- team/oej/res_config_ldap/res/res_config_ldap.c (original)
+++ team/oej/res_config_ldap/res/res_config_ldap.c Sun Apr  9 13:56:48 2006
@@ -67,9 +67,6 @@
 static int parse_config(void);
 static int ldap_reconnect(void);
 static int realtime_ldap_status(int fd, int argc, char **argv);
-
-
-STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
@@ -1131,7 +1128,7 @@
 		}
 
 		if (!(s = ast_variable_retrieve(config, "_general", "dbhost"))) {
-			ast_log(LOG_ERROR, "LDAP RealTime: No database host found.\n");
+			ast_log(LOG_ERROR, "LDAP RealTime: No directory host found.\n");
 			dbhost[0] = '\0';
 		} else {
 			strncpy(dbhost, s, sizeof(dbhost) - 1);
@@ -1147,7 +1144,7 @@
 
 		if (!(s = ast_variable_retrieve(config, "_general", "dbport"))) {
 			ast_log(LOG_WARNING,
-					"LDAP RealTime: No database port found, using 389 as default.\n");
+					"LDAP RealTime: No directory port found, using 389 as default.\n");
 			dbport = 389;
 		} else {
 			dbport = atoi(s);
@@ -1189,17 +1186,17 @@
 		};
 	}
 	ast_config_destroy(config);
-	/*
-	   ast_log(LOG_DEBUG, "LDAP RealTime Host: %s\n", dbhost);
-	   ast_log(LOG_DEBUG, "LDAP RealTime Port: %i\n", dbport);
-	   ast_log(LOG_DEBUG, "LDAP RealTime User: %s\n", dbuser);
-	   ast_log(LOG_DEBUG, "LDAP RealTime Password: %s\n", dbpass);
-	   ast_log(LOG_DEBUG, "LDAP RealTime BaseDN: %s\n", dbbasedn);
-	 */
+	if (option_debug > 3) {
+		ast_log(LOG_DEBUG, "LDAP RealTime Host: %s\n", dbhost);
+		ast_log(LOG_DEBUG, "LDAP RealTime Port: %i\n", dbport);
+		ast_log(LOG_DEBUG, "LDAP RealTime User: %s\n", dbuser);
+		ast_log(LOG_DEBUG, "LDAP RealTime Password: %s\n", dbpass);
+		ast_log(LOG_DEBUG, "LDAP RealTime BaseDN: %s\n", dbbasedn);
+	}
 	return 1;
 }
 
-char *description(void)
+const char *description(void)
 {
 	return res_config_ldap_desc;
 }
@@ -1215,7 +1212,7 @@
 	return 0;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }