mDNSResponder-176.3.tar.gz

[apple/mdnsresponder.git] / mDNSWindows / ControlPanel / SharedSecret.cpp

diff --git a/mDNSWindows/ControlPanel/SharedSecret.cpp b/mDNSWindows/ControlPanel/SharedSecret.cpp
index 8f0260bac3675abc51d272f06a85b9c5c84c3a31..8633fd7bdcea481da2b0df09c6f1f22c01fe86d0 100644 (file)
--- a/mDNSWindows/ControlPanel/SharedSecret.cpp
+++ b/mDNSWindows/ControlPanel/SharedSecret.cpp
@@ -1,28 +1,28 @@
-/*
+/* -*- Mode: C; tab-width: 4 -*-
+ *

  * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
  *
  * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ *     http://www.apache.org/licenses/LICENSE-2.0

  * 
  * 

- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and

  * limitations under the License.
  * limitations under the License.

- * 
- * @APPLE_LICENSE_HEADER_END@

 
     Change History (most recent first):
 
 $Log: SharedSecret.cpp,v $
 
     Change History (most recent first):
 
 $Log: SharedSecret.cpp,v $

+Revision 1.6  2007/06/12 20:06:06  herscher
+<rdar://problem/5263387> ControlPanel was inadvertently adding a trailing dot to all key names.
+
+Revision 1.5  2006/08/14 23:25:28  cheshire
+Re-licensed mDNSResponder daemon source code under Apache License, Version 2.0
+

 Revision 1.4  2005/10/18 06:13:41  herscher
 <rdar://problem/4192119> Prepend "$" to key name to ensure that secure updates work if the domain name and key name are the same
 
 Revision 1.4  2005/10/18 06:13:41  herscher
 <rdar://problem/4192119> Prepend "$" to key name to ensure that secure updates work if the domain name and key name are the same
 


@@ -118,17 +118,17 @@ CSharedSecret::Commit( CString zone )
        // If there isn't a trailing dot, add one because the mDNSResponder
        // presents names with the trailing dot.
 
        // If there isn't a trailing dot, add one because the mDNSResponder
        // presents names with the trailing dot.
 

-       if ( zone.ReverseFind( '.' ) != zone.GetLength() )
+       if ( zone.ReverseFind( '.' ) != ( zone.GetLength() - 1 ) )

        {
                zone += '.';
        }
 
        {
                zone += '.';
        }
 

-       if ( m_key.ReverseFind( '.' ) != m_key.GetLength() )
+       if ( m_key.ReverseFind( '.' ) != ( m_key.GetLength() - 1 ) )

        {
                m_key += '.';
        }
 
        {
                m_key += '.';
        }
 

-       // <rdar://problem/ >
+       // <rdar://problem/4192119>

        //
        // Prepend "$" to the key name, so that there will
        // be no conflict between the zone name and the key
        //
        // Prepend "$" to the key name, so that there will
        // be no conflict between the zone name and the key