* along with srvx; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*
+ *
+ * INSTRUCTIONS:
+ * * Setup an ldap server. Add inetOrgAnon to the schema (it is in tools/ldap)
+ * * Make sure ldap is enabled at compile time (debian needs libldap2-dev package)
+ * * Enable ldap in x3.conf and set everything
+ * * Initial import: you can use the secret authserv search action add2ldap
+ * to get your users into ldap. /msg authserv search add2ldap account *
*
* TODO:
* * get queries working in static existance, so i understand how it works
#include "config.h"
#ifdef WITH_LDAP
+#define LDAP_DEPRECATED 1
+
#include <stdio.h>
#include <stdlib.h>
#include <ldap.h>
+#include "base64.h"
#include "conf.h"
#include "global.h"
#include "log.h"
return(buf);
}
-
-/* from php5 sources */
-static char base64_table[] =
- { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
- };
-static char base64_pad = '=';
-
-char *base64_encode(const unsigned char *str, int length, int *ret_length)
-{
- const unsigned char *current = str;
- char *p;
- char *result;
-
- if ((length + 2) < 0 || ((length + 2) / 3) >= (1 << (sizeof(int) * 8 - 2))) {
- if (ret_length != NULL) {
- *ret_length = 0;
- }
- return NULL;
- }
-
- result = (char *)calloc((((length + 2) / 3) * 4)+1, sizeof(char));
- p = result;
-
- while (length > 2) { /* keep going until we have less than 24 bits */
- *p++ = base64_table[current[0] >> 2];
- *p++ = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
- *p++ = base64_table[((current[1] & 0x0f) << 2) + (current[2] >> 6)];
- *p++ = base64_table[current[2] & 0x3f];
-
- current += 3;
- length -= 3; /* we just handle 3 octets of data */
- }
-
- /* now deal with the tail end of things */
- if (length != 0) {
- *p++ = base64_table[current[0] >> 2];
- if (length > 1) {
- *p++ = base64_table[((current[0] & 0x03) << 4) + (current[1] >> 4)];
- *p++ = base64_table[(current[1] & 0x0f) << 2];
- *p++ = base64_pad;
- } else {
- *p++ = base64_table[(current[0] & 0x03) << 4];
- *p++ = base64_pad;
- *p++ = base64_pad;
- }
- }
- if (ret_length != NULL) {
- *ret_length = (int)(p - result);
- }
- *p = '\0';
- return result;
-}
-
-
char **make_object_vals()
{
unsigned int y;
char *passbuf;
packed = pack(crypted, &len);
- base64pass = base64_encode(packed, len, NULL);
+ base64_encode_alloc((char *)packed, len, &base64pass);
passbuf = malloc(strlen(base64pass) + 1 + 5);
strcpy(passbuf, "{MD5}");
strcat(passbuf, base64pass);
LDAPMod **mods;
int rc, i;
int num_mods;
- char *passbuf;
+ char *passbuf = NULL;
if(!admin_bind && LDAP_SUCCESS != ( rc = ldap_do_admin_bind())) {
log_module(MAIN_LOG, LOG_ERROR, "failed to bind as admin");