rpam-ruby19 1.1.1 → 1.2.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = Rpam 
 
-* http://rubyforge.org/projects/rpam
+* https://github.com/canweriotnow/rpam-ruby19
 
 == DESCRIPTION:
 
@@ -14,17 +14,25 @@
 
 == SYNOPSIS:
 
-In a nutshell:
+In a nutshell (using the 'rpam' PAM service):
 
   require 'rpam'
-  include Rpam
 
-  if authpam("user","password") == true
+  if Rpam.auth("user","password") == true
 	puts "Authenticate Successful"
   else
-  	puts "Authenticate Failure"
+    puts "Authenticate Failure"
   end
 
+Or, to use a different PAM service:
+
+  if Rpam.auth("user", "password", :service => 'my_foo') == true
+
+This also supports compatibility with the original 'rpam':
+
+  include Rpam
+  if authpam("user","password") == true
+
 == REQUIREMENTS:
 
 
@@ -33,7 +41,7 @@ In a nutshell:
 
 == INSTALL:
 
-* gem install rpam (might need sudo privileges)
+* gem install rpam-ruby19 (might need sudo privileges)
 
 Or, you can do it the hard way (without Rubygems):
 

data/ext/Rpam/extconf.rb

@@ -19,4 +19,4 @@ have_func("pam_acct_mgmt")
 #have_func("pam_putenv")
 #have_func("pam_getenv")
 
-create_makefile("rpam")
+create_makefile("rpam_ext")

data/ext/Rpam/{rpam.c → rpam_ext.c}

@@ -26,12 +26,10 @@ typedef struct {
 	char *name, *pw;
 } pam_auth_t;
     
-static const char
-*rpam_servicename = "rpam";
-
 VALUE Rpam;
+VALUE Rpam_Ext;
 
-void Init_rpam();
+void Init_rpam_ext();
 
 /*
  * auth_pam_talker: supply authentication information to PAM when asked
@@ -89,14 +87,16 @@ int auth_pam_talker(int num_msg,
 }
 
 /* Authenticates a user and returns TRUE on success, FALSE on failure */
-VALUE method_authpam(VALUE self, VALUE username, VALUE password) {	
+VALUE method_authpam(VALUE self, VALUE username, VALUE password, VALUE servicename) {	
+	char* rpam_servicename;
     pam_auth_t userinfo = {NULL, NULL};
 	struct pam_conv conv_info = {&auth_pam_talker, (void *) &userinfo};
 	pam_handle_t *pamh = NULL;
 	int result;
 
-   	userinfo.name = StringValuePtr(username);
-	userinfo.pw =   StringValuePtr(password);
+	rpam_servicename = StringValuePtr(servicename);
+	userinfo.name =    StringValuePtr(username);
+	userinfo.pw =      StringValuePtr(password);
  
 	if ((result = pam_start(rpam_servicename, userinfo.name, &conv_info, &pamh)) 
             != PAM_SUCCESS) {
@@ -122,7 +122,8 @@ VALUE method_authpam(VALUE self, VALUE username, VALUE password) {
 }
 
 /* initialize */
-void Init_rpam() {
+void Init_rpam_ext() {
 	Rpam = rb_define_module("Rpam");
-	rb_define_method(Rpam, "authpam", method_authpam, 2);	
+	Rpam_Ext = rb_define_module_under(Rpam, "Ext");
+	rb_define_singleton_method(Rpam_Ext, "authpam", method_authpam, 3);
 }

data/lib/rpam.rb

@@ -0,0 +1,18 @@
+require 'rpam_ext'
+
+module Rpam
+  def authpam *args
+    ::Rpam.auth(*args)
+  end
+
+  class <<self
+    def auth user, password, options = {}
+      options = options.dup
+      options[:service] ||= 'rpam'
+
+      Rpam::Ext.authpam(user, password, options[:service])
+    end
+
+    alias :authpam :auth
+  end
+end

data/rpam.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = %q{rpam-ruby19}
-  s.version = "1.1.1"
-  s.date = %q{2011-06-13}
+  s.version = "1.2.1"
+  s.date = %q{2011-08-16}
   s.summary = %q{PAM integration with ruby.}
   s.require_paths = ["lib"]
   s.email = %q{jasonlewis.x@gmail.com}
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   Modules - integration}
   s.required_ruby_version = Gem::Version::Requirement.new(">= 1.9.1")
   s.extra_rdoc_files = ["README.rdoc"]
-  s.authors = ["Andre Osti de Moura", "Jason Lewis"]
-  s.files = ["ext/Rpam/rpam.c", "ext/Rpam/extconf.rb", "rpam.gemspec", "README.rdoc", "LICENSE"]
+  s.authors = ["Andre Osti de Moura", "Jason Lewis", "Fred Emmott"]
+  s.files = ["ext/Rpam/rpam_ext.c", "ext/Rpam/extconf.rb", "rpam.gemspec", "README.rdoc", "LICENSE", 'lib/rpam.rb']
   s.has_rdoc = true
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rpam", "--main", "README.rdoc"]
   s.extensions = ["ext/Rpam/extconf.rb"]

metadata

@@ -1,66 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rpam-ruby19
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Andre Osti de Moura
 - Jason Lewis
+- Fred Emmott
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-13 00:00:00 Z
+date: 2011-08-16 00:00:00.000000000Z
 dependencies: []
-
-description: |-
-  This extension provides PAM  - Pluggable Authentication
-    Modules - integration
+description: ! "This extension provides PAM  - Pluggable Authentication\n  Modules
+  - integration"
 email: jasonlewis.x@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/Rpam/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- ext/Rpam/rpam.c
+files:
+- ext/Rpam/rpam_ext.c
 - ext/Rpam/extconf.rb
 - rpam.gemspec
 - README.rdoc
 - LICENSE
+- lib/rpam.rb
 homepage: https://github.com/canweriotnow/rpam-ruby19
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Rpam
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: PAM integration with ruby.
 test_files: []
-