You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ec...@apache.org on 2005/03/01 17:13:58 UTC

cvs commit: jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx URMAuthenticatorSSX.java

eckehard    2005/03/01 08:13:58

  Modified:    proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx
                        Tag: TWS421_BRANCH URMAuthenticatorSSX.java
  Log:
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.4.2   +12 -6     jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx/URMAuthenticatorSSX.java
  
  Index: URMAuthenticatorSSX.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/proposals/tamino/src/ssx/org/apache/slide/urm/authenticator/impl/ssx/URMAuthenticatorSSX.java,v
  retrieving revision 1.1.4.1
  retrieving revision 1.1.4.2
  diff -u -r1.1.4.1 -r1.1.4.2
  --- URMAuthenticatorSSX.java	21 May 2004 11:49:27 -0000	1.1.4.1
  +++ URMAuthenticatorSSX.java	1 Mar 2005 16:13:57 -0000	1.1.4.2
  @@ -74,7 +74,7 @@
   		   /*20*/"addGroupAttr", "personPropAttr", "groupPropAttr", "serverType",
   		   /*24*/"databaseUri", "connectionPerOperation",
   		   /*26*/"authDaemonPath", "winUserExist",
  -		   /*28*/"winCheckLocalGroups", null}; //"allowDomainAsBasebindDn"
  +		   /*28*/"winCheckLocalGroups", "useLogonUseron2000", null}; //"allowDomainAsBasebindDn"
           
   	   int[] userDbPropIntKeys = {
   		   /*0*/ SSXUserDBConstants.SSX_UDB_IPT_VALIDTIME, SSXUserDBConstants.SSX_UDB_IPT_MAXUSERS,
  @@ -91,7 +91,7 @@
   		   /*22*/SSXUserDBConstants.SSX_UDB_IPT_GROUP_PROPERTY_ATTR, SSXUserDBConstants.SSX_UDB_IPT_SERVER_TYPE,
   		   /*24*/SSXUserDBConstants.SSX_UDB_IPT_DATABASEURI, SSXUserDBConstants.SSX_UDB_IPT_CREATE_CONNECTION_PER_OPERATION,
   		   /*26*/SSXUserDBConstants.SSX_UDB_IPT_AUTHD_PATH, SSXUserDBConstants.SSX_UDB_IPT_WIN_AUTH_USER_EXIST,
  -		   /*28*/SSXUserDBConstants.SSX_UDB_IPT_WIN_CHECK_LOCAL_GROUPS, 0};
  +		   /*28*/SSXUserDBConstants.SSX_UDB_IPT_WIN_CHECK_LOCAL_GROUPS, SSXUserDBConstants.SSX_UDB_IPT_WIN_LOGONUSER_ON_2000, 0};
               
           msUserDbInitPropNamesTable = new Hashtable();
           for (int i = 0; userDbPropStringKeys[i] != null; ++i)
  @@ -151,6 +151,12 @@
                   authtype =  attr.getProperty("value");
                   continue;
               }
  +            
  +            if (attrname.equalsIgnoreCase("sensitive")) {
  +            	String sensitive_str =  attr.getProperty("value");
  +            	if (sensitive_str != null) sensitive = new Boolean(sensitive_str).booleanValue();
  +                continue;
  +            }
               String attrval = attr.getProperty("value");//debug
    
               Integer attrkey = (Integer)msUserDbInitPropNamesTable.get(attrname);
  @@ -260,7 +266,7 @@
               auth_user.close();
               URMAclAdministratorImpl acladmin = new URMAclAdministratorImpl(mAdministratorProperties,
                                                       user, password, domain, owner);
  -            return new URMPrincipalImpl(user, domain, admin, acladmin);
  +            return new URMPrincipalImpl(user, password, domain, admin, acladmin);
           } catch (SSXUserDBNotImplementedException e) {
               throw new URMAuthenticatorException(msLogger, "F", e);
           } catch (SSXUnknownUserException e) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org