~ubuntu-branches/ubuntu/lucid/apf/lucid

Committer: Bazaar Package Importer
Author(s): Juan A. Diaz
Date: 2007-10-15 20:50:41 UTC
mfrom: (1.2.1 upstream) (3 feisty)
mto: This revision was merged to the branch mainline in revision 4.
Revision ID: james.westby@ubuntu.com-20071015205041-vhkhklncuq3bjq1s

http://bugs.debian.org/440985

* New upstream release.
* Added suport for certificate-based authentication (Closes: #440985).
Thanks to Joshua Judson Rosen for making his whishes come true.
* Added dpatch in the build-depends to solve a minor bug in the afclient's
manpages (lintian error: hyphen-used-as-minus-sign).

files added:
debian/patches

debian/patches/00list

debian/patches/01_doc_afclient.1.dpatch

debian/patches/02_doc_afclient.conf.5.dpatch

files modified:
ChangeLog

Makefile.in

NEWS

README

config.guess

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/rules

debian/watch

doc/afclient.1

doc/afclient.conf.5

doc/afclient_example.conf

doc/afserver.1

doc/afserver.conf.5

doc/afserver_example.conf

doc/en/README

modules/Makefile.in

modules/exmodule.c

src/Makefile.in

src/activefor.h

src/afclient.c

src/afclient.h

src/afserver.c

src/afserver.h

src/ar_options_struct.c

src/ar_options_struct.h

src/audit_list_node_struct.c

src/audit_list_node_struct.h

src/audit_list_struct.c

src/audit_list_struct.h

src/base64.c

src/base64.h

src/buf_list_node_struct.c

src/buf_list_node_struct.h

src/buf_list_struct.c

src/buf_list_struct.h

src/client_configuration_struct.c

src/client_configuration_struct.h

src/client_initialization.c

src/client_initialization.h

src/client_realm_struct.c

src/client_realm_struct.h

src/client_remoteadmin.c

src/client_remoteadmin.h

src/client_reverse_udp.c

src/client_reverse_udp.h

src/client_shutdown.c

src/client_shutdown.h

src/client_signals.c

src/client_signals.h

src/clientnames.c

src/clientnames.h

src/connect_client_struct.c

src/connect_client_struct.h

src/connect_user_struct.c

src/connect_user_struct.h

src/daemon.c

src/daemon.h

src/file.c

src/file.h

src/file_client.c

src/file_server.c

src/first_run.c

src/first_run.h

src/header_buffer_struct.c

src/header_buffer_struct.h

src/http_proxy_client.c

src/http_proxy_client.h

src/http_proxy_functions.c

src/http_proxy_functions.h

src/http_proxy_options_struct.c

src/http_proxy_options_struct.h

src/http_proxy_server.c

src/http_proxy_server.h

src/inet_ntop.c

src/inet_ntop.h

src/logging.c

src/logging.h

src/make_ssl_handshake.c

src/make_ssl_handshake.h

src/module_struct.c

src/module_struct.h

src/network.c

src/network.h

src/port_list_node_struct.c

src/port_list_node_struct.h

src/port_list_struct.c

src/port_list_struct.h

src/realmnames.c

src/realmnames.h

src/remoteadmin_codes.h

src/remove_client_task.c

src/remove_client_task.h

src/server_check.c

src/server_check.h

src/server_configuration_struct.c

src/server_configuration_struct.h

src/server_eval.c

src/server_eval.h

src/server_find.c

src/server_find.h

src/server_get.c

src/server_get.h

src/server_realm_struct.c

src/server_realm_struct.h

src/server_remoteadmin.c

src/server_remoteadmin.h

src/server_remove.c

src/server_remove.h

src/server_set.c

src/server_set.h

src/server_signals.c

src/server_signals.h

src/ssl_fd_struct.c

src/ssl_fd_struct.h

src/ssl_routines.c

src/ssl_routines.h

src/stats.c

src/stats.h

src/string_functions.c

src/string_functions.h

src/task_list_node_struct.c

src/task_list_node_struct.h

src/task_scheduler_struct.c

src/task_scheduler_struct.h

src/task_struct.c

src/task_struct.h

src/thread_management.c

src/thread_management.h

src/timeval_functions.c

src/timeval_functions.h

src/usage.c

src/usage.h

src/user_stats_struct.c

src/user_stats_struct.h

src/usernames.c

src/usernames.h

src/usr_cli_struct.c

src/usr_cli_struct.h

Show diffs side-by-side

added added

removed removed

src/afclient.c

* active port forwarder - software for secure forwarding

* 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

{"portnum", 1, 0, 'p'},

{"verbose", 0, 0, 'v'},

{"keyfile", 1, 0, 'k'},

{"cerfile", 1, 0, 'c'},

{"storefile", 1, 0, 's'},

{"cfgfile", 1, 0, 'f'},

{"log", 1, 0, 'o'},

107

108

char* localPort = NULL;

108

109

char* localDestinationName = NULL;

109

110

char* keys = NULL;

111

char* certif = NULL;

110

112

char* store = NULL;

111

113

char* dateformat = NULL;

112

114

char* kaTimeout = NULL;

180

182

181

183

while ((n = getopt_long(argc, argv,

182

184

GETOPT_LONG_LIBDL(GETOPT_LONG_LIBPTHREAD(

183

GETOPT_LONG_AF_INET6("huUn:m:d:p:vk:s:o:i:D:rP:X:VK:A:T:f:")))

185

GETOPT_LONG_AF_INET6("huUn:m:d:p:vk:c:s:o:i:D:rP:X:VK:A:T:f:")))

184

186

, long_options, 0)) != -1) {

185

187

switch (n) {

186

188

case 'h': {

250

252

keys = optarg;

251

253

break;

252

254

}

255

case 'c': {

256

certif = optarg;

257

break;

258

}

253

259

case 's': {

254

260

store = optarg;

255

261

break;

385

391

else {

386

392

ClientConfiguration_set_keysFile(cconfig, keys);

387

393

}

394

if (certif != NULL) {

395

ClientConfiguration_set_certificateFile(cconfig, certif);

396

}

388

397

if (store == NULL) {

389

398

if (ClientConfiguration_get_storeFile(cconfig) == NULL) {

390

399

ClientConfiguration_set_storeFile(cconfig, "known_hosts");

486

495

exit(1);

487

496

}

488

497

ClientConfiguration_set_keysFile(cconfig, keys);

498

ClientConfiguration_set_certificateFile(cconfig, certif);

489

499

ClientConfiguration_set_storeFile(cconfig, store);

490

500

ClientConfiguration_set_dateFormat(cconfig, dateformat);

491

501

ClientConfiguration_set_realmsNumber(cconfig, 1);

695

705

"Setting rsa key failed (%s)... exiting", keys);

696

706

exit(1);

697

707

}

698

708

709

certif = ClientConfiguration_get_certificateFile(cconfig);

710

if (certif) {

711

if (SSL_CTX_use_certificate_file(ctx, certif, SSL_FILETYPE_PEM) != 1) {

712

aflog(LOG_T_INIT, LOG_I_CRIT,

713

"Setting certificate failed (%s)... exiting", certif);

714

exit(1);

715

}

716

}

717

699

718

if ((ClientRealm_get_clientMode(pointer) != CLIENTREALM_MODE_REMOTE) &&

700

719

(!verbose))

701

720

daemon(0, 0);

Older »