/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
*
- *
- *
- * ldap_backend.c
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
+/*
* AUTHOR: Flavio Pescuma, MARA Systems AB <flavio@marasystems.com>
*/
#include "squid.h"
#include "ldap_backend.h"
-#if _SQUID_MSWIN_ /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_ && !_SQUID_CYGWIN_
#define snprintf _snprintf
#include <windows.h>
n += 3;
size -= 3;
if (size > 0) {
- *escaped++ = '\\';
- snprintf(escaped, 3, "%02x", (int) *src++);
+ *escaped = '\\';
+ ++escaped;
+ snprintf(escaped, 3, "%02x", (int) *src);
+ ++src;
escaped += 2;
}
break;
default:
- *escaped++ = *src++;
- n++;
- size--;
+ *escaped = *src;
+ ++escaped;
+ ++src;
+ ++n;
+ --size;
}
}
*escaped = '\0';
ldap_msgfree(res);
/* try to connect to the LDAP server agin, maybe my persisten conexion failed. */
if (!retry) {
- retry++;
+ ++retry;
ldap_unbind(ld);
ld = NULL;
ldapconnect();
value = values;
while (*value) {
if (encrpass) {
- if (strcmp(strtok(*value, delimiter), realm) == 0) {
+ const char *t = strtok(*value, delimiter);
+ if (t && strcmp(t, realm) == 0) {
password = strtok(NULL, delimiter);
break;
}
password = *value;
break;
}
- value++;
+ ++value;
}
debug("password: %s\n", password);
if (password)
fprintf(stderr, PROGRAM_NAME " WARNING, LDAP error '%s'\n", ldap_err2string(rc));
/* try to connect to the LDAP server agin, maybe my persisten conexion failed. */
if (!retry) {
- retry++;
+ ++retry;
ldap_unbind(ld);
ld = NULL;
ldapconnect();
return NULL;
}
-
-
static void
ldapconnect(void)
{
/* On Windows ldap_start_tls_s is available starting from Windows XP,
* so we need to bind at run-time with the function entry point
*/
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
if (use_tls) {
HMODULE WLDAP32Handle;
sslpath);
exit(1);
} else {
- sslinit++;
+ ++sslinit;
}
if ((ld = ldapssl_init(ldapServer, port, 1)) == NULL) {
fprintf(stderr, "\nUnable to connect to SSL LDAP server: %s port:%d\n",
value = argv[1] + 2;
} else if (argc > 2) {
value = argv[2];
- argv++;
- argc--;
+ ++argv;
+ --argc;
} else
value = "";
break;
}
- argv++;
- argc--;
+ ++argv;
+ --argc;
switch (option) {
case 'H':
#if !HAS_URI_SUPPORT
} else {
ldapServer = xstrdup(value);
}
- argc--;
- argv++;
+ --argc;
+ ++argv;
}
if (!ldapServer)