sys-admin 1.5.3 → 1.5.4

data/CHANGES

@@ -1,3 +1,6 @@
+== 1.5.4 - 7-Oct-2010
+* Prefer the getlastlogx() function over lastlog() where supported.
+
 == 1.5.3 - 6-Oct-2010
 * Refactored the Rakefile. The old installation tasks have been replaced
   with gem build and install tasks. In addition, the platform handling has

data/Rakefile

@@ -10,6 +10,7 @@ task :clean do
   Dir['*.gem'].each{ |f| File.delete(f) } # Remove any .gem files
   unless WINDOWS
     Dir.chdir('ext') do
+      rm_rf('conftest.dSYM') if File.exists?('conftest.dSYM') # OS X
       build_file = 'admin.' + Config::CONFIG['DLEXT']
       sh 'make distclean' if File.exists?(build_file)
       File.delete("sys/#{build_file}") if File.exists?("sys/#{build_file}")

data/ext/extconf.rb

@@ -39,12 +39,16 @@ else
    utmp    = have_header("utmp.h")
    lastlog = have_header("lastlog.h")
 
+   if have_header("utmpx.h")
+     have_func("getlastlogx")
+   end 
+
    if utmp || lastlog
-      have_struct_member(
-         "struct lastlog",
-         "ll_time",
-         ["utmp.h", "time.h", "lastlog.h"]
-      )
+     have_struct_member(
+       "struct lastlog",
+       "ll_time",
+       ["utmp.h", "time.h", "lastlog.h"]
+     )
    end
 
    $CFLAGS += " -D_POSIX_PTHREAD_SEMANTICS"

data/ext/sys/admin.h

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_ADMIN_VERSION "1.5.3"
+#define SYS_ADMIN_VERSION "1.5.4"
 
 #if defined(__MACH__) || defined(__APPLE__)
 #define __BSD__
@@ -18,11 +18,15 @@
 #define __BSD__
 #endif
 
+#if defined(HAVE_UTMPX_H) && defined(HAVE_GETLASTLOGX)
+#include <utmpx.h>
+#else
 #ifdef HAVE_LASTLOG_H
 #include <lastlog.h>
 #else
 #include <utmp.h>
 #endif
+#endif
 
 #ifndef _POSIX_LOGIN_NAME_MAX
 #define _POSIX_LOGIN_NAME_MAX 9
@@ -422,34 +426,44 @@ void get_group_from_value(VALUE v_group, struct group* grp){
  * still be empty or nil.
  */
 int get_lastlog_info(struct passwd* pwd, VALUE v_user){
-   int fd;
-   ssize_t bytes_read;
-   struct lastlog log;
-   int ll_size = sizeof(struct lastlog);
-
-   /* The lastlog information is not necessarily readable by all users, so
-    * ignore open() errors if they occur.
-    */
-   if((fd = open(_PATH_LASTLOG, O_RDONLY)) == -1)
-      return -1;
-
-   if((bytes_read = pread(fd, &log, ll_size, pwd->pw_uid * ll_size)) < 0){
-      close(fd);
-      rb_raise(cAdminError, "%s", strerror(errno));
-   }
+#ifdef HAVE_GETLASTLOGX
+  struct lastlogx log;
+
+  if(getlastlogx(pwd->pw_uid, &log)){
+    rb_iv_set(v_user, "@login_time", rb_time_new(log.ll_tv.tv_sec, log.ll_tv.tv_usec));
+    rb_iv_set(v_user, "@login_device", rb_str_new2(log.ll_line));
+    rb_iv_set(v_user, "@login_host", rb_str_new2(log.ll_host));
+  }
+#else
+  int fd;
+  ssize_t bytes_read;
+  struct lastlog log;
+  int ll_size = sizeof(struct lastlog);
+
+  /* The lastlog information is not necessarily readable by all users, so
+   * ignore open() errors if they occur.
+   */
+  if((fd = open(_PATH_LASTLOG, O_RDONLY)) == -1)
+    return -1;
+
+  if((bytes_read = pread(fd, &log, ll_size, pwd->pw_uid * ll_size)) < 0){
+    close(fd);
+    rb_raise(cAdminError, "%s", strerror(errno));
+  }
 
-   close(fd);
+  close(fd);
 
-   if(bytes_read > 0){
+  if(bytes_read > 0){
 #ifdef HAVE_ST_LL_TIME
-      if(log.ll_time != 0)
-         rb_iv_set(v_user, "@login_time", rb_time_new(log.ll_time, 0));
+    if(log.ll_time != 0)
+      rb_iv_set(v_user, "@login_time", rb_time_new(log.ll_time, 0));
+#endif
+    rb_iv_set(v_user, "@login_device", rb_str_new2(log.ll_line));
+    rb_iv_set(v_user, "@login_host", rb_str_new2(log.ll_host));
+  }
 #endif
-      rb_iv_set(v_user, "@login_device", rb_str_new2(log.ll_line));
-      rb_iv_set(v_user, "@login_host", rb_str_new2(log.ll_host));
-   }
 
-   return 0;
+  return 0;
 }
 
 /*

data/sys-admin.gemspec

@@ -4,7 +4,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-admin'
-  spec.version   = '1.5.3'
+  spec.version   = '1.5.4'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

data/test/test_sys_admin.rb

@@ -16,6 +16,6 @@ end
 
 class TC_Sys_Admin_All < Test::Unit::TestCase
   def test_version
-    assert_equal('1.5.3', Sys::Admin::VERSION)
+    assert_equal('1.5.4', Sys::Admin::VERSION)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -06:00
+date: 2010-10-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,21 +46,21 @@ extra_rdoc_files:
 - MANIFEST
 - ext/sys/admin.c
 files: 
-- Rakefile
-- README
+- CHANGES
 - doc/sys-admin-unix.txt
 - doc/sys-admin-windows.txt
-- sys-admin.gemspec
-- CHANGES
 - examples/groups.rb
 - examples/users.rb
-- test/test_sys_admin_windows.rb
-- test/test_sys_admin_unix.rb
-- test/test_sys_admin.rb
-- MANIFEST
+- ext/extconf.rb
 - ext/sys/admin.c
 - ext/sys/admin.h
-- ext/extconf.rb
+- MANIFEST
+- Rakefile
+- README
+- sys-admin.gemspec
+- test/test_sys_admin.rb
+- test/test_sys_admin_unix.rb
+- test/test_sys_admin_windows.rb
 has_rdoc: true
 homepage: http://www.github.com/djberg96/sysutils
 licenses: