beepcore-java-commits

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous
In directory sc8-pr-cvs1:/tmp/cvs-serv21224/src/org/beepcore/beep/profile/sasl/anonymous

Modified Files:
	SASLAnonymousProfile.java 
Log Message:
Merge from PIGGYBACK branch

Index: SASLAnonymousProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** SASLAnonymousProfile.java	14 Sep 2003 04:30:15 -0000	1.11
--- SASLAnonymousProfile.java	15 Sep 2003 15:23:31 -0000	1.12
***************
*** 104,145 ****
          Session t = channel.getSession();
  
!         if(data != null)
!         {
!             try {
!                 Blob blob = new Blob(data);
!                 data = blob.getData();
! 
!                 if (log.isDebugEnabled()) {
!                     log.debug("SASLAnon...User claims to be=>" + data);
!                 }
!                 finishListenerAuthentication(SASLAnonymousProfile.generateCredential(data),
!                                              t);
! 
!                 // Generate a blob indicating that we're done and 
!                 // return it in the profile response to the StartChannel request
!                 data = null;
!                 blob = new Blob(Blob.STATUS_COMPLETE,data);
!                 sendProfile(t, uri, blob.toString(), channel);
!                 enableIO(channel.getSession());
!             } catch (Exception x) {
!                 channel.getSession().terminate(x.getMessage());
!                 return;
!             }
!             // Skip standard start channel handling
!             throw new TuningResetException("SASL ANON RESET");
!         }
!         else
!         {
!             try {
!                 AnonymousAuthenticator auth = new AnonymousAuthenticator(this);
!                 auth.started(channel);
!                 sendProfile(t, uri, null, channel);
!                 enableIO(channel.getSession());
!             } catch (Exception x) {
!                 channel.getSession().terminate(x.getMessage());
!                 return;
!             }
!             // Skip standard start channel handling
!             throw new TuningResetException("SASL ANON RESET");
          }
      }
--- 104,113 ----
          Session t = channel.getSession();
  
!         try {
!             AnonymousAuthenticator auth = new AnonymousAuthenticator(this);
!             auth.started(channel);
!         } catch (Exception x) {
!             channel.getSession().terminate(x.getMessage());
!             return;
          }
      }