Revision: 15358
          http://sourceforge.net/p/edk2/code/15358
Author:   vanjeff
Date:     2014-03-21 01:48:06 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Sync patch r15356 from main trunk.
Force UID modules build error to warn user that currently it is just a sample.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/15356

Modified Paths:
--------------
    branches/UDK2010.SR1/SecurityPkg/SecurityPkg.dsc
    
branches/UDK2010.SR1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
    
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
    
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c

Modified: branches/UDK2010.SR1/SecurityPkg/SecurityPkg.dsc
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/SecurityPkg.dsc    2014-03-21 01:16:07 UTC 
(rev 15357)
+++ branches/UDK2010.SR1/SecurityPkg/SecurityPkg.dsc    2014-03-21 01:48:06 UTC 
(rev 15358)
@@ -120,10 +120,10 @@
 [Components]
   SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf
   SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
-  SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
+  #SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.inf
   
SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
-  
SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
-  
SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+  
#SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerDxe.inf
+  
#SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
 
   #
   # Application
@@ -163,7 +163,7 @@
 
 [Components.IA32, Components.X64, Components.IPF]
   
SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderDxe.inf
-  
SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
+#  
SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProviderDxe.inf
   SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
   SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
 

Modified: 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
===================================================================
--- 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
        2014-03-21 01:16:07 UTC (rev 15357)
+++ 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProvider.c
        2014-03-21 01:48:06 UTC (rev 15358)
@@ -1,7 +1,7 @@
 /** @file
   Password Credential Provider driver implementation.
     
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -1428,6 +1428,11 @@
   EFI_STATUS  Status;
 
   //
+  // It is NOT robust enough to be included in production.
+  //
+  #error "This implementation is just a sample, please comment this line if 
you really want to use this driver."
+
+  //
   // Init credential table.
   //
   Status = InitCredentialTable ();

Modified: 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
===================================================================
--- 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
        2014-03-21 01:16:07 UTC (rev 15357)
+++ 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UsbCredentialProviderDxe/UsbCredentialProvider.c
        2014-03-21 01:48:06 UTC (rev 15358)
@@ -1,7 +1,7 @@
 /** @file
   Usb Credential Provider driver implemenetation.
     
-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -1377,6 +1377,11 @@
   EFI_STATUS  Status;
 
   //
+  // It is NOT robust enough to be included in production.
+  //
+  #error "This implementation is just a sample, please comment this line if 
you really want to use this driver."
+
+  //
   // Init credential table.
   //
   Status = InitCredentialTable ();

Modified: 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
===================================================================
--- 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
    2014-03-21 01:16:07 UTC (rev 15357)
+++ 
branches/UDK2010.SR1/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManager.c
    2014-03-21 01:48:06 UTC (rev 15358)
@@ -1,7 +1,7 @@
 /** @file
   This driver manages user information and produces user manager protocol.
   
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD 
License 
 which accompanies this distribution.  The full text of the license may be 
found at 
@@ -3736,6 +3736,11 @@
   EFI_STATUS  Status;
 
   //
+  // It is NOT robust enough to be included in production.
+  //
+  #error "This implementation is just a sample, please comment this line if 
you really want to use this driver."
+
+  //
   // Initiate form browser.
   //
   InitFormBrowser ();

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to