Compare commits
No commits in common. 'c9' and 'i8c' have entirely different histories.
@ -1,58 +0,0 @@
|
|||||||
From c7caa6027c92b28aa11b8da74d56357e12f56d67 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Daniel=20Kope=C4=8Dek?= <dkopecek@redhat.com>
|
|
||||||
Date: Wed, 20 Feb 2019 12:00:56 +0100
|
|
||||||
Subject: [PATCH] Use LDADD for adding curl library to the linker command
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.am | 2 +-
|
|
||||||
configure.ac | 5 +++--
|
|
||||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index 4b05d7a..1541d56 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -55,7 +55,7 @@ if USE_CURL
|
|
||||||
aide_SOURCES += include/fopen.h src/fopen.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
-aide_LDADD = -lm @PCRELIB@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
|
|
||||||
+aide_LDADD = -lm @PCRELIB@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@ @CURLLIB@
|
|
||||||
AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir) \
|
|
||||||
-I$(top_srcdir)/include \
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 3598ebe..0418c59 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -702,24 +702,25 @@ if test x$with_zlib = xyes; then
|
|
||||||
compoptionstring="${compoptionstring}WITH_ZLIB\\n"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+CURLLIB=
|
|
||||||
if test x$with_curl = xyes; then
|
|
||||||
AC_PATH_PROG(curlconfig, "curl-config")
|
|
||||||
if test "_$curlconfig" != _ ; then
|
|
||||||
CURL_CFLAGS=`$curlconfig --cflags`
|
|
||||||
- CURL_LIBS=`$curlconfig --libs`
|
|
||||||
+ CURLLIB=`$curlconfig --libs`
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])
|
|
||||||
fi
|
|
||||||
AC_CHECK_HEADERS(curl/curl.h,,
|
|
||||||
[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
|
|
||||||
CFLAGS="$CFLAGS $CURL_CFLAGS"
|
|
||||||
- LDFLAGS="$LDFLAGS $CURL_LIBS"
|
|
||||||
AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
|
|
||||||
[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
|
|
||||||
)
|
|
||||||
AC_DEFINE(WITH_CURL,1,[use curl])
|
|
||||||
compoptionstring="${compoptionstring}WITH_CURL\\n"
|
|
||||||
fi
|
|
||||||
+AC_SUBST(CURLLIB)
|
|
||||||
AM_CONDITIONAL(USE_CURL, test x$havecurl = xyes)
|
|
||||||
|
|
||||||
AC_ARG_WITH(mhash,
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
diff --color -ru a/configure.ac b/configure.ac
|
|
||||||
--- a/configure.ac 2021-05-20 09:31:11.686987129 +0200
|
|
||||||
+++ b/configure.ac 2021-05-20 09:39:43.369967457 +0200
|
|
||||||
@@ -784,11 +784,11 @@
|
|
||||||
[if test "x$withval" = "xmd5" ;then
|
|
||||||
CONFIGHMACTYPE="MHASH_MD5"
|
|
||||||
else if test "x$withval" = "xsha1" ;then
|
|
||||||
- CONFIGHMACTYPE="MHASH_SHA1"
|
|
||||||
+ CONFIGHMACTYPE="MHASH_SHA1"
|
|
||||||
else if test "x$withval" = "xsha256" ;then
|
|
||||||
- CONFIGHMACTYPE="MHASH_SHA256"
|
|
||||||
+ CONFIGHMACTYPE="MHASH_SHA256"
|
|
||||||
else if test "x$withval" = "xsha512" ;then
|
|
||||||
- CONFIGHMACTYPE="MHASH_SHA512"
|
|
||||||
+ CONFIGHMACTYPE="MHASH_SHA512"
|
|
||||||
else
|
|
||||||
echo "Valid parameters for --with-confighmactype are md5, sha1, sha256 and sha512"
|
|
||||||
exit 1
|
|
||||||
@@ -799,7 +799,6 @@
|
|
||||||
AC_DEFINE_UNQUOTED(CONFIGHMACTYPE,$CONFIGHMACTYPE,[hash type for config file check])],
|
|
||||||
[
|
|
||||||
AC_DEFINE_UNQUOTED(CONFIGHMACTYPE,MHASH_MD5,[hash type for config file check])]
|
|
||||||
-,
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_ARG_WITH([confighmackey],
|
|
||||||
@@ -846,18 +845,18 @@
|
|
||||||
|
|
||||||
AC_ARG_WITH([dbhmactype],
|
|
||||||
AC_HELP_STRING([--with-dbhmactype=TYPE],
|
|
||||||
- [Hash type to use for checking db. Valid values are md5 and sha1.]),
|
|
||||||
+ [Hash type to use for checking db. Valid values are md5, sha1, sha256 and sha512.]),
|
|
||||||
[if test "x$withval" = "xmd5" ;then
|
|
||||||
DBHMACTYPE="MHASH_MD5"
|
|
||||||
else if test "x$withval" = "xsha1" ;then
|
|
||||||
- DBHMACTYPE="MHASH_SHA1"
|
|
||||||
+ DBHMACTYPE="MHASH_SHA1"
|
|
||||||
else if test "x$withval" = "xsha256" ;then
|
|
||||||
- CONFIGHMACTYPE="MHASH_SHA256"
|
|
||||||
+ DBHMACTYPE="MHASH_SHA256"
|
|
||||||
else if test "x$withval" = "xsha512" ;then
|
|
||||||
- CONFIGHMACTYPE="MHASH_SHA512"
|
|
||||||
+ DBHMACTYPE="MHASH_SHA512"
|
|
||||||
else
|
|
||||||
- echo "Valid parameters for --with-dbhmactype are md5, sha1, sha256 and sha512"
|
|
||||||
- exit 1
|
|
||||||
+ echo "Valid parameters for --with-dbhmactype are md5, sha1, sha256 and sha512"
|
|
||||||
+ exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
Only in b: config.log
|
|
||||||
diff --color -ru a/contrib/sshaide.sh b/contrib/sshaide.sh
|
|
||||||
--- a/contrib/sshaide.sh 2016-07-25 22:56:55.000000000 +0200
|
|
||||||
+++ b/contrib/sshaide.sh 2021-05-20 11:11:24.112542472 +0200
|
|
||||||
@@ -260,7 +260,7 @@
|
|
||||||
_randword=`grep -n . ${_wordlist} | grep "^${_linenum}:" | cut -d: -f2`
|
|
||||||
|
|
||||||
# If $_randword has anything other than lower-case chars, try again
|
|
||||||
- (echo ${_randword} | LC_ALL=C grep '[^a-z]' 2>&1 >> /dev/null \
|
|
||||||
+ ({ echo ${_randword} | LC_ALL=C grep '[^a-z]' 2>&1; } >> /dev/null \
|
|
||||||
&& gen_rand_word ) || \
|
|
||||||
|
|
||||||
# Return the word
|
|
||||||
diff --color -ru a/src/commandconf.c b/src/commandconf.c
|
|
||||||
--- a/src/commandconf.c 2021-05-20 10:37:53.842382143 +0200
|
|
||||||
+++ b/src/commandconf.c 2021-05-25 14:16:43.278526146 +0200
|
|
||||||
@@ -313,7 +313,7 @@
|
|
||||||
} else {
|
|
||||||
/* gzread returns 0 even if uncompressed bytes were read*/
|
|
||||||
error(240,"nread=%d,strlen(buf)=%lu,errno=%s,gzerr=%s\n",
|
|
||||||
- retval,(unsigned long)strnlen((char*)buf, max_size),
|
|
||||||
+ retval,(unsigned long)strnlen((char*)buf, retval),
|
|
||||||
strerror(errno),gzerror(*db_gzp,&err));
|
|
||||||
if(retval==0){
|
|
||||||
retval=strnlen((char*)buf, max_size);
|
|
||||||
@@ -836,6 +836,11 @@
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+ default: {
|
|
||||||
+ error(0,"Unsupported dbtype.\n");
|
|
||||||
+ free(u);
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(val);
|
|
||||||
@@ -900,7 +905,7 @@
|
|
||||||
} else {
|
|
||||||
error_init(u,0);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+ free(u->value);
|
|
||||||
free(u);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --color -ru a/src/db_disk.c b/src/db_disk.c
|
|
||||||
--- a/src/db_disk.c 2021-05-20 10:37:53.842382143 +0200
|
|
||||||
+++ b/src/db_disk.c 2021-05-20 12:37:00.081493364 +0200
|
|
||||||
@@ -125,10 +125,10 @@
|
|
||||||
|
|
||||||
ret = (char *) malloc (len);
|
|
||||||
ret[0] = (char) 0;
|
|
||||||
- strncpy(ret, conf->root_prefix, conf->root_prefix_length+1);
|
|
||||||
- strncat (ret, r->path, len2);
|
|
||||||
+ strcpy(ret, conf->root_prefix);
|
|
||||||
+ strcat (ret, r->path);
|
|
||||||
if (r->path[len2 - 1] != '/') {
|
|
||||||
- strncat (ret, "/", 1);
|
|
||||||
+ strcat (ret, "/");
|
|
||||||
}
|
|
||||||
strcat (ret, s);
|
|
||||||
return ret;
|
|
||||||
@@ -207,8 +207,8 @@
|
|
||||||
if (!root_handled) {
|
|
||||||
root_handled = 1;
|
|
||||||
fullname=malloc((conf->root_prefix_length+2)*sizeof(char));
|
|
||||||
- strncpy(fullname, conf->root_prefix, conf->root_prefix_length+1);
|
|
||||||
- strncat (fullname, "/", 1);
|
|
||||||
+ strcpy(fullname, conf->root_prefix);
|
|
||||||
+ strcat (fullname, "/");
|
|
||||||
if (!get_file_status(&fullname[conf->root_prefix_length], &fs)) {
|
|
||||||
add = check_rxtree (&fullname[conf->root_prefix_length], conf->tree, &attr, fs.st_mode);
|
|
||||||
error (240, "%s match=%d, tree=%p, attr=%llu\n", &fullname[conf->root_prefix_length], add,
|
|
||||||
@@ -346,8 +346,8 @@
|
|
||||||
error (255, "r->childs %p, r->parent %p,r->checked %i\n",
|
|
||||||
r->childs, r->parent, r->checked);
|
|
||||||
fullname=malloc((conf->root_prefix_length+strlen(r->path)+1)*sizeof(char));
|
|
||||||
- strncpy(fullname, conf->root_prefix, conf->root_prefix_length+1);
|
|
||||||
- strncat(fullname, r->path, strlen(r->path));
|
|
||||||
+ strcpy(fullname, conf->root_prefix);
|
|
||||||
+ strcat(fullname, r->path);
|
|
||||||
dirh=open_dir(fullname);
|
|
||||||
if (! dirh) {
|
|
||||||
|
|
||||||
@@ -441,8 +441,8 @@
|
|
||||||
|
|
||||||
|
|
||||||
char* fullname=malloc((conf->root_prefix_length+2)*sizeof(char));
|
|
||||||
- strncpy(fullname, conf->root_prefix, conf->root_prefix_length+1);
|
|
||||||
- strncat (fullname, "/", 1);
|
|
||||||
+ strcpy(fullname, conf->root_prefix);
|
|
||||||
+ strcat (fullname, "/");
|
|
||||||
dirh=open_dir(fullname);
|
|
||||||
free(fullname);
|
|
||||||
|
|
||||||
diff --color -ru a/src/error.c b/src/error.c
|
|
||||||
--- a/src/error.c 2021-05-20 10:37:53.836382037 +0200
|
|
||||||
+++ b/src/error.c 2021-05-21 11:49:09.781313097 +0200
|
|
||||||
@@ -125,7 +125,7 @@
|
|
||||||
fh=be_init(0,url,0);
|
|
||||||
if(fh!=NULL) {
|
|
||||||
conf->report_fd=list_append(conf->report_fd,(void*)fh);
|
|
||||||
- conf->report_url=list_append(conf->report_url,(void*)url);
|
|
||||||
+ conf->report_url=list_append(conf->report_url,(void*)strdup(url));
|
|
||||||
return RETOK;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --color -ru a/src/util.c b/src/util.c
|
|
||||||
--- a/src/util.c 2021-05-20 10:37:53.843382160 +0200
|
|
||||||
+++ b/src/util.c 2021-05-25 11:04:39.507278771 +0200
|
|
||||||
@@ -105,13 +105,15 @@
|
|
||||||
for(i=0;r[0]!='/'&&r[0]!='\0';r++,i++);
|
|
||||||
if(r[0]=='\0'){
|
|
||||||
error(0,"Invalid file-URL,no path after hostname: file:%s\n",t);
|
|
||||||
+ free(u);
|
|
||||||
+ free(val_copy);
|
|
||||||
free(hostname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
u->value=strdup(r);
|
|
||||||
r[0]='\0';
|
|
||||||
if(gethostname(hostname,MAXHOSTNAMELEN)==-1){
|
|
||||||
- strncpy(hostname,"localhost", 10);
|
|
||||||
+ strncpy(hostname,"localhost",MAXHOSTNAMELEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
if( (strcmp(t,"localhost")==0)||(strcmp(t,hostname)==0)){
|
|
||||||
@@ -119,6 +121,9 @@
|
|
||||||
break;
|
|
||||||
} else {
|
|
||||||
error(0,"Invalid file-URL, cannot use hostname other than localhost or %s: file:%s\n",hostname,u->value);
|
|
||||||
+ free(u->value);
|
|
||||||
+ free(u);
|
|
||||||
+ free(val_copy);
|
|
||||||
free(hostname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
@@ -229,6 +234,10 @@
|
|
||||||
int i=0;
|
|
||||||
|
|
||||||
pc=(char*)malloc(sizeof(char)*11);
|
|
||||||
+ if (!pc) {
|
|
||||||
+ error(0, "Memory allocation failed.\n");
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
for(i=0;i<10;i++){
|
|
||||||
pc[i]='-';
|
|
||||||
}
|
|
||||||
@@ -369,14 +378,17 @@
|
|
||||||
|
|
||||||
if (path != NULL) {
|
|
||||||
if (path[0] == '~') {
|
|
||||||
- if((homedir=getenv("HOME")) != NULL) {
|
|
||||||
+ if ((homedir=getenv("HOME")) != NULL) {
|
|
||||||
path_len = strlen(path+sizeof(char));
|
|
||||||
homedir_len = strlen(homedir);
|
|
||||||
full_len = homedir_len+path_len;
|
|
||||||
full = malloc(sizeof(char) * (full_len+1));
|
|
||||||
- strncpy(full, homedir, homedir_len);
|
|
||||||
- strncpy(full+homedir_len, path+sizeof(char), path_len);
|
|
||||||
- full[full_len] = '\0';
|
|
||||||
+ if (!full) {
|
|
||||||
+ error(0, "Memory allocation failed.\n");
|
|
||||||
+ return path;
|
|
||||||
+ }
|
|
||||||
+ strcpy(full, homedir);
|
|
||||||
+ strcat(full, path+sizeof(char));
|
|
||||||
free(path);
|
|
||||||
/* Don't free(homedir); because it is not safe on some platforms */
|
|
||||||
path = full;
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
diff --up ./src/compare_db.c ./src/compare_db.c
|
||||||
|
--- ./src/compare_db.c
|
||||||
|
+++ ./src/compare_db.c
|
||||||
|
@@ -438,7 +438,11 @@ snprintf(*values[0], l, "%s",s);
|
||||||
|
} else {
|
||||||
|
*values = malloc(1 * sizeof (char*));
|
||||||
|
if (DB_FTYPE&attr) {
|
||||||
|
- easy_string(get_file_type_string(line->perm))
|
||||||
|
+ char *file_type = get_file_type_string(line->perm);
|
||||||
|
+ if (!file_type) {
|
||||||
|
+ error(2,"%s: ", file_type);
|
||||||
|
+ }
|
||||||
|
+ easy_string(file_type)
|
||||||
|
} else if (DB_LINKNAME&attr) {
|
||||||
|
easy_string(line->linkname)
|
||||||
|
easy_number((DB_SIZE|DB_SIZEG),size,"%li")
|
||||||
|
diff -up ./src/db_file.c ./src/db_file.c
|
||||||
|
--- ./src/db_file.c
|
||||||
|
+++ ./src/db_file.c
|
||||||
|
@@ -194,6 +194,10 @@ int db_file_read_spec(int db){
|
||||||
|
|
||||||
|
*db_order=(DB_FIELD*) malloc(1*sizeof(DB_FIELD));
|
||||||
|
|
||||||
|
+ if (*db_order == NULL){
|
||||||
|
+ error(1,"malloc for *db_order failed in %s", __func__);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
while ((i=db_scan())!=TNEWLINE){
|
||||||
|
switch (i) {
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in new issue