From 9336216818041c1a891a734f3dd431e7fbc50bcf Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 18 Feb 2010 14:18:22 -0800 Subject: Move stub fork_callback() into parent class Move the stub fork_callback method into Wallet::Kadmin and make both Wallet::Kadmin::Heimdal and Wallet::Kadmin::MIT inherit from Wallet::Kadmin. Add POD documentation for fork_callback. --- perl/Wallet/Kadmin/Heimdal.pm | 10 ++++------ perl/Wallet/Kadmin/MIT.pm | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'perl/Wallet/Kadmin') diff --git a/perl/Wallet/Kadmin/Heimdal.pm b/perl/Wallet/Kadmin/Heimdal.pm index 2ad35e3..30b1e52 100644 --- a/perl/Wallet/Kadmin/Heimdal.pm +++ b/perl/Wallet/Kadmin/Heimdal.pm @@ -13,10 +13,13 @@ package Wallet::Kadmin::Heimdal; require 5.006; use strict; -use vars qw($VERSION); +use vars qw(@ISA $VERSION); use Heimdal::Kadm5 qw(KRB5_KDB_DISALLOW_ALL_TIX); use Wallet::Config (); +use Wallet::Kadmin (); + +@ISA = qw(Wallet::Kadmin); # This version should be increased on any code change to this module. Always # use two digits for the minor version with a leading zero if necessary so @@ -48,11 +51,6 @@ sub canonicalize_principal { return $principal; } -# Set a callback to be called for forked kadmin processes. This does nothing -# for Heimdal, as we're not forking anything, but remains for compatibility -# with the MIT kadmin module. -sub fork_callback { } - ############################################################################## # kadmin Interaction ############################################################################## diff --git a/perl/Wallet/Kadmin/MIT.pm b/perl/Wallet/Kadmin/MIT.pm index 8449868..f181739 100644 --- a/perl/Wallet/Kadmin/MIT.pm +++ b/perl/Wallet/Kadmin/MIT.pm @@ -15,9 +15,12 @@ package Wallet::Kadmin::MIT; require 5.006; use strict; -use vars qw($VERSION); +use vars qw(@ISA $VERSION); use Wallet::Config (); +use Wallet::Kadmin (); + +@ISA = qw(Wallet::Kadmin); # This version should be increased on any code change to this module. Always # use two digits for the minor version with a leading zero if necessary so -- cgit v1.2.3