"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "usertab.c" between
sarg-2.3.11.tar.gz and sarg-2.4.0.tar.gz

About: SARG ia a Squid Analysis Report Generator.

[ To the main sarg source changes report ]

usertab.c  (sarg-2.3.11):usertab.c  (sarg-2.4.0)
/* /*
* SARG Squid Analysis Report Generator http://sarg.sourceforge.net * SARG Squid Analysis Report Generator http://sarg.sourceforge.net
* 1998, 2013 * 1998, 2015
* *
* SARG donations: * SARG donations:
* please look at http://sarg.sourceforge.net/donations.php * please look at http://sarg.sourceforge.net/donations.php
* Support: * Support:
* http://sourceforge.net/projects/sarg/forums/forum/363374 * http://sourceforge.net/projects/sarg/forums/forum/363374
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
skipping to change at line 26 skipping to change at line 26
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
* *
*/ */
/*!\file
\brief Provide a meanigfull name instead of the user ID or IP address shown in t
he
reports.
*/
#include "include/conf.h" #include "include/conf.h"
#include "include/defs.h" #include "include/defs.h"
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
#define LDAP_DEPRECATED 1 #define LDAP_DEPRECATED 1
#include <ldap.h> #include <ldap.h>
#include <ldap_cdefs.h> #include <ldap_cdefs.h>
#include <ldap_features.h> #include <ldap_features.h>
#if defined(HAVE_ICONV_H)
#include <iconv.h>
#define USE_ICONV 1
#endif //HAVE_ICONV_H
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
/*!
The possible sources to map the user ID or IP address to the name to display
in the reports.
*/
enum UserTabEnum enum UserTabEnum
{ {
//! Users matched against the ::UserTabFile file. //! Users matched against the ::UserTabFile file.
UTT_File, UTT_File,
//! Users matched agains a LDAP. //! Users matched agains a LDAP.
UTT_Ldap, UTT_Ldap,
//! No user matching performed. //! No user matching performed.
UTT_None UTT_None
}; };
/*!
Tell the database source to use to map the user ID or IP address to a meaningful
l
name.
*/
enum UserTabEnum which_usertab=UTT_None; enum UserTabEnum which_usertab=UTT_None;
static char *userfile=NULL; static char *userfile=NULL;
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
static LDAP *ldap_handle=NULL; static LDAP *ldap_handle=NULL;
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
#ifdef USE_ICONV
//! iconv conversion descriptor to convert the string returned by LDAP.
static iconv_t ldapiconv=(iconv_t)-1;
//! Buffer to store the converted string.
static char *ldapconvbuffer=NULL;
//! Size of the converted string buffer.
static int ldapconvbuffersize=0;
#endif
/*!
Read the \a UserTabFile database.
The file contains the IP address or ID of the user then some spaces and
the real name of the user to show in the report.
Any trailing space or tabulation is removed from the real name. The user ID or I
P cannot contain
a space or a tabulation but it may contain any other character, including the co
lon that was
forbidden in the past. That change was made to allow IPv6 addresses.
The file may contain comments if the line starts with a #.
\param UserTabFile The name of the file to read.
*/
static void init_file_usertab(const char *UserTabFile) static void init_file_usertab(const char *UserTabFile)
{ {
FILE *fp_usr; FILE *fp_usr;
long int nreg; long int nreg;
char buf[MAXLEN]; char buf[MAXLEN];
int z1, z2; int z1, z2;
if((fp_usr=fopen(UserTabFile,"r"))==NULL) { if ((fp_usr=fopen(UserTabFile,"r"))==NULL) {
debugapos("usertab",_("Cannot open file \"%s\": %s\n"),UserTabFil debuga(__FILE__,__LINE__,_("Cannot open file \"%s\": %s\n"),UserT
e,strerror(errno)); abFile,strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (fseek(fp_usr, 0, SEEK_END)==-1) { if (fseek(fp_usr, 0, SEEK_END)==-1) {
debuga(_("Failed to move till the end of file \"%s\": %s\n"),User TabFile,strerror(errno)); debuga(__FILE__,__LINE__,_("Failed to move till the end of file \ "%s\": %s\n"),UserTabFile,strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
nreg = ftell(fp_usr); nreg = ftell(fp_usr);
if (nreg<0) { if (nreg<0) {
debuga(_("Cannot get the size of file \"%s\": %s\n"),UserTabFile, strerror(errno)); debuga(__FILE__,__LINE__,_("Cannot get the size of file \"%s\"\n" ),UserTabFile);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
nreg += 100; nreg += 100;
if (fseek(fp_usr, 0, SEEK_SET)==-1) { if (fseek(fp_usr, 0, SEEK_SET)==-1) {
debuga(_("Failed to rewind file \"%s\": %s\n"),UserTabFile,strerr or(errno)); debuga(__FILE__,__LINE__,_("Failed to rewind file \"%s\": %s\n"), UserTabFile,strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if((userfile=(char *) malloc(nreg))==NULL){ if ((userfile=(char *) malloc(nreg))==NULL){
debuga(_("Cannot load \"%s\": not enough memory\n"),UserTabFile); debuga(__FILE__,__LINE__,_("ERROR: Cannot load. Memory fault\n"))
;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
userfile[0]='\t'; userfile[0]='\t';
z2=1; z2=1;
while(fgets(buf,sizeof(buf),fp_usr)!=NULL) { while(fgets(buf,sizeof(buf),fp_usr)!=NULL) {
if (buf[0]=='#') continue; if (buf[0]=='#') continue;
fixendofline(buf); fixendofline(buf);
z1=0; z1=0;
while(buf[z1] && (unsigned char)buf[z1]>' ') { while(buf[z1] && (unsigned char)buf[z1]>' ') {
if (z2+3>=nreg) { //need at least 3 additional bytes for the minimum string "\n\t\0" if (z2+3>=nreg) { //need at least 3 additional bytes for the minimum string "\n\t\0"
debuga(_("The list of the users is too long in fi le \"%s\"\n"),UserTabFile); debuga(__FILE__,__LINE__,_("The list of users is too long in file \"%s\"\n"),UserTabFile);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
userfile[z2++]=buf[z1++]; userfile[z2++]=buf[z1++];
} }
while(buf[z1] && (unsigned char)buf[z1]<=' ') z1++; while(buf[z1] && (unsigned char)buf[z1]<=' ') z1++;
userfile[z2++]='\n'; userfile[z2++]='\n';
while(buf[z1] && (unsigned char)buf[z1]>=' ') { while(buf[z1] && (unsigned char)buf[z1]>=' ') {
if (z2+2>=nreg) { //need at least 2 additional bytes for "\t\0" if (z2+2>=nreg) { //need at least 2 additional bytes for "\t\0"
debuga(_("The list of the users is too long in fi le \"%s\"\n"),UserTabFile); debuga(__FILE__,__LINE__,_("The list of users is too long in file \"%s\"\n"),UserTabFile);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
userfile[z2++]=buf[z1++]; userfile[z2++]=buf[z1++];
} }
while(userfile[z2-1]==' ') z2--; while(userfile[z2-1]==' ') z2--;
userfile[z2++]='\t'; userfile[z2++]='\t';
} }
userfile[z2]='\0'; userfile[z2]='\0';
fclose(fp_usr); if (fclose(fp_usr)==EOF) {
debuga(__FILE__,__LINE__,_("Read error in \"%s\": %s\n"),UserTabF
ile,strerror(errno));
exit(EXIT_FAILURE);
}
} }
/*!
Get the real name of the user from the usertab file read by init_file_usertab().
\param user The user ID or IP address to search.
\param name The buffer to store the real name of the user.
\param namelen The size of the \a name buffer.
If the user ID or IP address isn't found, the output buffer \a name contains
the unmatched input string.
*/
static void get_usertab_name(const char *user,char *name,int namelen) static void get_usertab_name(const char *user,char *name,int namelen)
{ {
char warea[MAXLEN]; char warea[MAXLEN];
char *str; char *str;
sprintf(warea,"\t%s\n",user); sprintf(warea,"\t%s\n",user);
if((str=(char *) strstr(userfile,warea)) == (char *) NULL ) { if ((str=(char *) strstr(userfile,warea)) == (char *) NULL ) {
safe_strcpy(name,user,namelen); safe_strcpy(name,user,namelen);
} else { } else {
str=strchr(str+1,'\n'); str=strchr(str+1,'\n');
str++; str++;
namelen--; namelen--;
for(z1=0; *str != '\t' && z1<namelen ; z1++) { for (z1=0; *str != '\t' && z1<namelen ; z1++) {
name[z1]=*str++; name[z1]=*str++;
} }
name[z1]='\0'; name[z1]='\0';
} }
} }
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
static void init_ldap_usertab(void) { /*!
* \brief Connect to the LDAP server
*/
static void connect_ldap(void)
{
char *ldapuri; char *ldapuri;
LDAPURLDesc url; LDAPURLDesc url;
int rc; int rc;
ldap_handle = NULL; if (ldap_handle)
ldap_unbind(ldap_handle);
/* Setting LDAP connection and initializing cache */ /* Setting LDAP connection and initializing cache */
memset(&url,0,sizeof(url)); memset(&url,0,sizeof(url));
url.lud_scheme = "ldap"; url.lud_scheme = "ldap";
url.lud_host = LDAPHost; url.lud_host = LDAPHost;
url.lud_port = LDAPPort; url.lud_port = LDAPPort;
url.lud_scope = LDAP_SCOPE_DEFAULT; url.lud_scope = LDAP_SCOPE_DEFAULT;
ldapuri = ldap_url_desc2str(&url); ldapuri = ldap_url_desc2str(&url);
if (ldapuri==NULL) { if (ldapuri==NULL) {
debuga(_("Cannot prepare ldap URI for server %s on port %d\n"),LD APHost,LDAPPort); debuga(__FILE__,__LINE__,_("Cannot prepare ldap URI for server %s on port %d\n"),LDAPHost,LDAPPort);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
rc = ldap_initialize(&ldap_handle, ldapuri); rc = ldap_initialize(&ldap_handle, ldapuri);
if (rc != LDAP_SUCCESS) { if (rc != LDAP_SUCCESS) {
debuga(_("Unable to connect to LDAP server %s on port %d: %d (%s) \n"), LDAPHost, LDAPPort, rc, ldap_err2string(rc)); debuga(__FILE__,__LINE__,_("Unable to connect to LDAP server %s o n port %d: %d (%s)\n"), LDAPHost, LDAPPort, rc, ldap_err2string(rc));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
ldap_memfree(ldapuri); ldap_memfree(ldapuri);
if (ldap_set_option(ldap_handle, LDAP_OPT_REFERRALS, LDAP_OPT_OFF) != LDA P_OPT_SUCCESS) { if (ldap_set_option(ldap_handle, LDAP_OPT_REFERRALS, LDAP_OPT_OFF) != LDA P_OPT_SUCCESS) {
debuga(_("Could not disable LDAP_OPT_REFERRALS\n")); debuga(__FILE__,__LINE__,_("Could not disable LDAP_OPT_REFERRALS\ n"));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
int ldap_protocol_version = LDAPProtocolVersion; int ldap_protocol_version = LDAPProtocolVersion;
if (ldap_set_option(ldap_handle, LDAP_OPT_PROTOCOL_VERSION, &ldap_protoco l_version) != LDAP_SUCCESS) { if (ldap_set_option(ldap_handle, LDAP_OPT_PROTOCOL_VERSION, &ldap_protoco l_version) != LDAP_SUCCESS) {
debuga(_("Could not set LDAP protocol version %d\n"), ldap_protoc ol_version); debuga(__FILE__,__LINE__,_("Could not set LDAP protocol version % d\n"), ldap_protocol_version);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* Bind to the LDAP server. */ /* Bind to the LDAP server. */
rc = ldap_simple_bind_s( ldap_handle, LDAPBindDN, LDAPBindPW ); rc = ldap_simple_bind_s( ldap_handle, LDAPBindDN, LDAPBindPW );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
debuga(_("Cannot bind to LDAP server: %s\n"), ldap_err2string(rc) ); debuga(__FILE__,__LINE__,_("Cannot bind to LDAP server: %s\n"), l dap_err2string(rc));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
}
/* Initializing cache */ /*!
Initialize the communication with the LDAP server whose name is in
::LDAPHost and connect to port ::LDAPPort.
*/
static void init_ldap_usertab(void)
{
ldap_handle = NULL;
connect_ldap();
#ifdef USE_ICONV
// prepare for the string conversion
if (LDAPNativeCharset[0]!='\0') {
ldapiconv = iconv_open( LDAPNativeCharset, "UTF-8" );
if (ldapiconv==(iconv_t)-1) {
debuga(__FILE__,__LINE__,_("iconv cannot convert from UTF
-8 to %s: %s\n"),LDAPNativeCharset,strerror(errno));
exit(EXIT_FAILURE);
}
}
ldapconvbuffer=NULL;
ldapconvbuffersize=0;
#endif
/* Initializing cache */
init_cache(); init_cache();
} }
const char * charset_convert( const char * str_in, const char * charset_to )
{
#ifdef USE_ICONV
size_t return_value;
const char * str_in_orig;
char * str_out;
size_t str_in_len;
size_t str_out_len;
str_in_len = strlen( str_in ) + 1;//process the terminating NUL too
str_out_len = ( 2 * str_in_len );
if (ldapconvbuffer==NULL || ldapconvbuffersize<str_out_len) {
ldapconvbuffersize=str_out_len;
str_out = realloc(ldapconvbuffer,ldapconvbuffersize);
if (!str_out) {
debuga(__FILE__,__LINE__,_("Not enough memory to convert
a LDAP returned string: %lu bytes required\n"),(unsigned long int)str_out_len);
exit(EXIT_FAILURE);
}
ldapconvbuffer = str_out;
} else {
str_out = ldapconvbuffer;
str_out_len = ldapconvbuffersize;
}
str_in_orig = str_in;
return_value = iconv(ldapiconv, (ICONV_CONST char **)&str_in, &str_in_len
, &str_out, &str_out_len );
if ( return_value == ( size_t ) -1 ) {
/* TRANSLATORS: The message is followed by the reason for the fai
lure. */
debuga(__FILE__,__LINE__,_("iconv failed on string \"%s\":\n"),st
r_in_orig);
switch ( errno ) {
/* See "man 3 iconv" for an explanation. */
case EILSEQ:
debuga(__FILE__,__LINE__,_("Invalid multibyte seq
uence.\n"));
break;
case EINVAL:
debuga(__FILE__,__LINE__,_("Incomplete multibyte
sequence.\n"));
break;
case E2BIG:
debuga(__FILE__,__LINE__,_("No more room.\n"));
break;
default:
debuga(__FILE__,__LINE__,_("Error: %s.\n"),strerr
or( errno ));
}
exit(EXIT_FAILURE);
}
return(ldapconvbuffer);
#else //USE_ICONV
return(str_in);
#endif //USE_ICONV
}
/*!
Get the real name of a user by searching the userlogin (user ID) in a LDAP.
\param userlogin The user ID to search.
\param name The buffer to store the real name of the user.
\param namelen The size of the \a name buffer.
If the user ID isn't found in the LDAP, the output buffer \a name contains
the unmatched input string.
*/
static void get_ldap_name(const char *userlogin,char *mappedname,int namelen) static void get_ldap_name(const char *userlogin,char *mappedname,int namelen)
{ {
/* Start searching username in cache */ /* Start searching username in cache */
// According to rfc2254 section 4, only *()\ and NUL must be escaped. Thi s list is rather conservative ! // According to rfc2254 section 4, only *()\ and NUL must be escaped. Thi s list is rather conservative !
const char strictchars[] = " ~!@^&(){}|<>?:;\"\'\\[]`,\r\n\0"; const char strictchars[] = " ~!@^&(){}|<>?:;\"\'\\[]`,\r\n\0";
char filtersearch[256], *searched_in_cache; char filtersearch[256], *searched_in_cache;
char searchloginname[3*MAX_USER_LEN]; char searchloginname[3*MAX_USER_LEN];
char *attr, **vals; char *attr, **vals;
const char *attr_out;
const char *ptr; const char *ptr;
LDAPMessage *result, *e; LDAPMessage *result, *e;
BerElement *ber; BerElement *ber;
int i; int i;
int slen; int slen;
int rc; int rc;
char *attrs[2]; char *attrs[2];
searched_in_cache = search_in_cache(userlogin); searched_in_cache = search_in_cache(userlogin);
if (searched_in_cache!=NULL) { if (searched_in_cache!=NULL) {
skipping to change at line 232 skipping to change at line 374
ptr+=2; ptr+=2;
} else { } else {
filtersearch[i++]=*ptr++; filtersearch[i++]=*ptr++;
} }
} }
filtersearch[i]='\0'; filtersearch[i]='\0';
/* Search record(s) in LDAP base */ /* Search record(s) in LDAP base */
attrs[0]=LDAPTargetAttr; attrs[0]=LDAPTargetAttr;
attrs[1]=NULL; attrs[1]=NULL;
rc= ldap_search_ext_s(ldap_handle, LDAPBaseSearch, LDAP_SCOPE_SUBTREE, fi ltersearch, attrs, 0, NULL, NULL, NULL, -1, &result); rc=ldap_search_ext_s(ldap_handle, LDAPBaseSearch, LDAP_SCOPE_SUBTREE, fil tersearch, attrs, 0, NULL, NULL, NULL, -1, &result);
if (rc != LDAP_SUCCESS) { if (rc != LDAP_SUCCESS) {
debuga(_("LDAP search failed: %s\n"), ldap_err2string(rc)); /*
debuga(_("looking for \"%s\" at or below \"%s\"\n"),filtersearch, * We know the connection was successfully established once. If i
LDAPBaseSearch); t fails now,
safe_strcpy(mappedname,userlogin,namelen); * it may be because the server timed out between two requests or
return; because
* there is an error in the request.
*
* Just in case the failure is due to a timeout, we try to connec
t and send
* the query again.
*/
connect_ldap();
rc=ldap_search_ext_s(ldap_handle, LDAPBaseSearch, LDAP_SCOPE_SUBT
REE, filtersearch, attrs, 0, NULL, NULL, NULL, -1, &result);
if (rc != LDAP_SUCCESS) {
debuga(__FILE__,__LINE__,_("LDAP search failed: %s\nlooki
ng for \"%s\" at or below \"%s\"\n"), ldap_err2string(rc),filtersearch,LDAPBaseS
earch);
safe_strcpy(mappedname,userlogin,namelen);
return;
}
} }
if (!(e = ldap_first_entry(ldap_handle, result))) { if (!(e = ldap_first_entry(ldap_handle, result))) {
insert_to_cache(userlogin, userlogin); insert_to_cache(userlogin, userlogin);
safe_strcpy(mappedname, userlogin,namelen); safe_strcpy(mappedname, userlogin,namelen);
return; return;
} }
for (attr = ldap_first_attribute(ldap_handle, e, &ber); attr != NULL; att r = ldap_next_attribute(ldap_handle, e, ber)) { for (attr = ldap_first_attribute(ldap_handle, e, &ber); attr != NULL; att r = ldap_next_attribute(ldap_handle, e, ber)) {
if (!strcasecmp(attr, LDAPTargetAttr)) { if (!strcasecmp(attr, LDAPTargetAttr)) {
if ((vals = (char **)ldap_get_values(ldap_handle, e, attr ))!=NULL) { if ((vals = (char **)ldap_get_values(ldap_handle, e, attr ))!=NULL) {
insert_to_cache(userlogin, vals[0]); attr_out = charset_convert( vals[0], LDAPNativeCh
safe_strcpy(mappedname, vals[0],namelen); arset );
insert_to_cache(userlogin, attr_out);
safe_strcpy(mappedname, attr_out, namelen);
ldap_memfree(vals); ldap_memfree(vals);
} }
ldap_memfree(attr); ldap_memfree(attr);
break; break;
} }
ldap_memfree(attr); ldap_memfree(attr);
} }
ldap_msgfree(result); ldap_msgfree(result);
} }
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
/*!
Initialize the data used by user_find().
If \a UserTabFile is ldap, the user ID is fetched from a LDAP server.
\param UserTabFile The name of the file to read or ldap. If it is empty, the fun
ction does nothing.
\note The memory and resources allocated by this function must be released by
a call to close_usertab().
*/
void init_usertab(const char *UserTabFile) void init_usertab(const char *UserTabFile)
{ {
if (strcmp(UserTabFile, "ldap") == 0) { if (strcmp(UserTabFile, "ldap") == 0) {
if(debug) if (debug) {
debuga(_("Loading user table from LDAP\n")); /* TRANSLATORS: The %s may be the string "ldap" or a file
name.*/
debuga(__FILE__,__LINE__,_("Loading User table from \"%s\
"\n"),UserTabFile);
}
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
which_usertab=UTT_Ldap; which_usertab=UTT_Ldap;
init_ldap_usertab(); init_ldap_usertab();
#else #else
debuga(_("LDAP module not compiled in sarg\n")); debuga(__FILE__,__LINE__,_("LDAP module not compiled in sarg\n")) ;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
} else if (UserTabFile[0] != '\0') { } else if (UserTabFile[0] != '\0') {
if(debug) if (debug)
debuga(_("Loading User table: %s\n"),UserTabFile); debuga(__FILE__,__LINE__,_("Loading User table from \"%s\
"\n"),UserTabFile);
which_usertab=UTT_File; which_usertab=UTT_File;
init_file_usertab(UserTabFile); init_file_usertab(UserTabFile);
} else { } else {
which_usertab=UTT_None; which_usertab=UTT_None;
} }
} }
/*!
Find the real name of the user with the ID or IP address in \a userlogin. The na
me is fetched
from the source initialized by init_usertab().
The usertab data must have been initialized by init_usertab().
\param mappedname A buffer to write the real name of the user.
\param namelen The size of the buffer.
\param userlogin The ID or IP address of the user.
*/
void user_find(char *mappedname, int namelen, const char *userlogin) void user_find(char *mappedname, int namelen, const char *userlogin)
{ {
if (which_usertab==UTT_File) { if (which_usertab==UTT_File) {
get_usertab_name(userlogin,mappedname,namelen); get_usertab_name(userlogin,mappedname,namelen);
} }
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
else if (which_usertab==UTT_Ldap) { else if (which_usertab==UTT_Ldap) {
get_ldap_name(userlogin,mappedname,namelen); get_ldap_name(userlogin,mappedname,namelen);
} }
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
else { else {
safe_strcpy(mappedname,userlogin,namelen); safe_strcpy(mappedname,userlogin,namelen);
} }
} }
/*!
Free the memory and resources allocated by init_usertab().
*/
void close_usertab(void) void close_usertab(void)
{ {
#ifdef HAVE_LDAP_H #ifdef HAVE_LDAP_H
if (ldap_handle) { if (ldap_handle) {
destroy_cache(); destroy_cache();
ldap_unbind(ldap_handle); ldap_unbind(ldap_handle);
ldap_handle=NULL; ldap_handle=NULL;
} }
#endif //HAVE_LDAP_H #endif //HAVE_LDAP_H
if(userfile) { #ifdef USE_ICONV
if (ldapiconv!=(iconv_t)-1) {
iconv_close (ldapiconv);
ldapiconv=(iconv_t)-1;
}
if (ldapconvbuffer) {
free(ldapconvbuffer);
ldapconvbuffer=NULL;
}
#endif // USE_ICONV
if (userfile) {
free(userfile); free(userfile);
userfile=NULL; userfile=NULL;
} }
} }
 End of changes. 39 change blocks. 
36 lines changed or deleted 250 lines changed or added
To the C Programs (all 53): section of the sarg source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)