Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made RPM work again

Browse Source
This commit is contained in:
Stefan Ritt 2023-02-03 16:52:09 +01:00
parent 63b6209695
commit 6ca918bbb5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildrpm
View File

@ -63,8 +63,10 @@ mkdir $dir/logbooks/demo/2001
# copy files to archive # copy files to archive
unalias cp unalias cp
cp -p src/*.c $dir/src cp -p src/*.c $dir/src
cp -p src/*.cxx $dir/src
cp -p src/*.h $dir/src cp -p src/*.h $dir/src
cp -p mxml/*.c $dir/mxml cp -p mxml/*.c $dir/mxml
cp -p mxml/*.cxx $dir/mxml
cp -p mxml/*.h $dir/mxml cp -p mxml/*.h $dir/mxml
cp -p Makefile $dir cp -p Makefile $dir
cp -p elogd.cfg.example $dir/elogd.cfg.example cp -p elogd.cfg.example $dir/elogd.cfg.example

2
elog.spec.template
View File

@ -14,7 +14,7 @@
# Build options : # Build options :
# Read: If neither macro exists, then add the default definition. # Read: If neither macro exists, then add the default definition.
%{?_with_krb5: %define _with_krb5 USE_KRB5=1} %{?_with_krb5: %define _with_krb5 USE_KRB5=1}
%{?_with_ldap: %define _with_ldap USE_LDAP=1} %{?_with_ldap: %define _with_ldap USE_LDAP=0}
%{?_with_pam: %define _with_pam USE_PAM=1} %{?_with_pam: %define _with_pam USE_PAM=1}
%{?_with_ssl: %define _with_ssl USE_SSL=1} %{?_with_ssl: %define _with_ssl USE_SSL=1}
# Default build options are with SSL # Default build options are with SSL

4
src/auth.cxx
View File

@ -448,12 +448,12 @@ int elog_conv(int num_msg, const struct pam_message **mess, struct pam_response
/* if we do not have enough space to allocate the response, we have an error /* if we do not have enough space to allocate the response, we have an error
* */ * */
if((*resp = calloc(num_msg, sizeof(struct pam_response))) == NULL) if((*resp = (pam_response*) calloc(num_msg, sizeof(struct pam_response))) == NULL)
return (PAM_BUF_ERR); return (PAM_BUF_ERR);
/* this is the password we got through the UI, this is put into the /* this is the password we got through the UI, this is put into the
* response, and given to pam_authenticate */ * response, and given to pam_authenticate */
if(!(resptok = strdup(my_data))) { if(!(resptok = strdup((const char *)my_data))) {
free(resp); free(resp);
return (PAM_BUF_ERR); return (PAM_BUF_ERR);
} }