From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 20 Sep 2010 20:41:59 +0000 (+0200)
Subject: merge mainline into jail
X-Git-Tag: 1.99~449^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b71d7500b41c8f313d02db77435adf629647633;p=thirdparty%2Fgrub.git

merge mainline into jail
---

1b71d7500b41c8f313d02db77435adf629647633
diff --cc include/grub/normal.h
index 7c99951c6,a3827f584..390dbb1da
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -115,6 -114,15 +114,17 @@@ void grub_normal_reset_more (void)
  
  void grub_xputs_normal (const char *str);
  
 +extern int grub_jail_level;
 +
+ grub_err_t
+ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
+ 			    const char *users, const char *hotkey,
+ 			    const char *prefix, const char *sourcecode);
+ 
+ grub_err_t
+ grub_normal_set_password (const char *user, const char *password);
+ 
+ void grub_normal_auth_init (void);
+ void grub_normal_auth_fini (void);
+ 
  #endif /* ! GRUB_NORMAL_HEADER */