[asterisk-commits] branch oej/test-this-branch r12872 - /team/oej/test-this-branch/res/

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Mar 14 04:04:58 MST 2006


Author: oej
Date: Tue Mar 14 05:04:56 2006
New Revision: 12872

URL: http://svn.digium.com/view/asterisk?rev=12872&view=rev
Log:
Fixes to make res_config_ldap compile

Modified:
    team/oej/test-this-branch/res/res_config_ldap.c

Modified: team/oej/test-this-branch/res/res_config_ldap.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/res/res_config_ldap.c?rev=12872&r1=12871&r2=12872&view=diff
==============================================================================
--- team/oej/test-this-branch/res/res_config_ldap.c (original)
+++ team/oej/test-this-branch/res/res_config_ldap.c Tue Mar 14 05:04:56 2006
@@ -133,7 +133,7 @@
 /*! \brief Create a new table_config */
 static struct ldap_table_config *table_config_new(const char *table_name)
 {
-	struct ldap_table_config *p = ast_calloc(sizeof(*p));
+	struct ldap_table_config *p = ast_calloc(1, sizeof(*p));
 	if (table_name)
 		p->table_name = strdup(table_name);
 	return p;
@@ -151,6 +151,8 @@
 	};
 	return NULL;
 };
+
+#ifdef DISABLED_CODE
 
 /*! \brief add attributes to table config - Should be locked before using it */
 static void ldap_table_config_add_attributes(struct ldap_table_config* table_config,const char* attributes_string)
@@ -184,7 +186,7 @@
 		free(string);
 	};
 };
-*/
+#endif
 
 /*! \brief add attribute to table config - Should be locked before using it */
 static void ldap_table_config_add_attribute(struct ldap_table_config *table_config,
@@ -582,7 +584,7 @@
 		free(new_value);
 }
 
-/*! \brief LDAP base function */
+/*! \brief LDAP base function 
  return a null terminated array of ast_variable (one per entry) or NULL if no entry is found or if an error occured
  caller should free the returned array and ast_variables
  entries_count_ptr is a pointer to found entries count (can be NULL)



More information about the asterisk-commits mailing list