tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] 

Use ssh_get_progname to fill __progname
This commit is contained in:
Damien Miller 2010-02-12 10:06:28 +11:00
parent 8ad0fbd98e
commit dfa4156dbd
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -42,6 +42,8 @@
Remove obsolete smartcard support Remove obsolete smartcard support
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
Make it compile on OSX Make it compile on OSX
- (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
Use ssh_get_progname to fill __progname
20100210 20100210
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for

4
ssh-pkcs11-client.c
View File

@ -16,6 +16,8 @@
#include "includes.h" #include "includes.h"
#ifdef ENABLE_PKCS11
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
@ -231,3 +233,5 @@ pkcs11_del_provider(char *name)
buffer_free(&msg); buffer_free(&msg);
return (ret); return (ret);
} }
#endif /* ENABLE_PKCS11 */

15
ssh-pkcs11-helper.c
View File

@ -16,6 +16,8 @@
#include "includes.h" #include "includes.h"
#ifdef ENABLE_PKCS11
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
@ -277,6 +279,8 @@ main(int argc, char **argv)
extern char *optarg; extern char *optarg;
extern char *__progname; extern char *__progname;
__progname = ssh_get_progname(argv[0]);
log_init(__progname, log_level, log_facility, log_stderr); log_init(__progname, log_level, log_facility, log_stderr);
in = STDIN_FILENO; in = STDIN_FILENO;
@ -352,3 +356,14 @@ main(int argc, char **argv)
process(); process();
} }
} }
#else /* ENABLE_PKCS11 */
int
main(int argc, char **argv)
{
extern char *__progname;
__progname = ssh_get_progname(argv[0]);
log_init(__progname, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTH, 0);
fatal("PKCS#11 support disabled at compile time");
}
#endif /* ENABLE_PKCS11 */

4
ssh-pkcs11.c
View File

@ -16,6 +16,8 @@
#include "includes.h" #include "includes.h"
#ifdef ENABLE_PKCS11
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
@ -548,3 +550,5 @@ fail:
dlclose(handle); dlclose(handle);
return (-1); return (-1);
} }
#endif /* ENABLE_PKCS11 */