CVS: sidai/passwd-utils passwd-mask-and-merge,1.2,1.3

[Will P. <pa...@us...>]

Update of /cvsroot/ark/sidai/passwd-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv2707/passwd-utils

Modified Files:
	passwd-mask-and-merge 
Log Message:
updates

Index: passwd-mask-and-merge
===================================================================
RCS file: /cvsroot/ark/sidai/passwd-utils/passwd-mask-and-merge,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** passwd-mask-and-merge	26 May 2001 21:59:13 -0000	1.2
--- passwd-mask-and-merge	10 Mar 2003 12:38:48 -0000	1.3
***************
*** 2,6 ****
  ##############################################################################
  # 
! # Copyright (C) 2001 Will Partain
  # 
  # This program is free software; you can redistribute it and/or modify
--- 2,6 ----
  ##############################################################################
  # 
! # Copyright (C) 2001,2003 Will Partain
  # 
  # This program is free software; you can redistribute it and/or modify
***************
*** 95,99 ****
  def get_yp_passwd():
      passwd = []
!     pf = os.popen( '/usr/bin/ypcat passwd' )
      while 1:
  	line = pf.readline()
--- 95,100 ----
  def get_yp_passwd():
      passwd = []
!     #real: pf = os.popen( '/usr/bin/ypcat passwd' )
!     pf = os.popen( 'cat passwd_file_real' )
      while 1:
  	line = pf.readline()