Diff of /trunk/1.6.x/ccs-patch/fs/ccs_common.c

TOMOYO

 Subversion リポジトリの参照



/[tomoyo]/trunk/1.6.x/ccs-patch/fs/ccs_common.c




Diff of /trunk/1.6.x/ccs-patch/fs/ccs_common.c



 Parent Directory

|  Revision Log



|  Patch














revision 357 by kumaneko,
Thu Aug 16 08:16:36 2007 UTC




revision 366 by kumaneko,
Fri Aug 17 04:44:33 2007 UTC






#

Line 5 



Line 5 













5
  *
  *

















6
  * Copyright (C) 2005-2007  NTT DATA CORPORATION
  * Copyright (C) 2005-2007  NTT DATA CORPORATION

















7
  *
  *















8


  * Version: 1.5.0-pre   2007/08/12


  * Version: 1.5.0-pre   2007/08/17















9
  *
  *

















10
  * This file is applicable to both 2.4.30 and 2.6.11 and later.
  * This file is applicable to both 2.4.30 and 2.6.11 and later.

















11
  * See README.ccs for ChangeLog.
  * See README.ccs for ChangeLog.











#

Line 959 
 static int AddExceptionPolicy(struct io_


Line 959 
 static int AddExceptionPolicy(struct io_












959
         } else if (strncmp(data, KEYWORD_NO_KEEP_DOMAIN, KEYWORD_NO_KEEP_DOMAIN_LEN) == 0) {
         } else if (strncmp(data, KEYWORD_NO_KEEP_DOMAIN, KEYWORD_NO_KEEP_DOMAIN_LEN) == 0) {

















960
                 return AddDomainKeeperPolicy(data + KEYWORD_NO_KEEP_DOMAIN_LEN, 1, is_delete);
                 return AddDomainKeeperPolicy(data + KEYWORD_NO_KEEP_DOMAIN_LEN, 1, is_delete);

















961
         } else if (strncmp(data, KEYWORD_INITIALIZE_DOMAIN, KEYWORD_INITIALIZE_DOMAIN_LEN) == 0) {
         } else if (strncmp(data, KEYWORD_INITIALIZE_DOMAIN, KEYWORD_INITIALIZE_DOMAIN_LEN) == 0) {















962


                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZE_DOMAIN_LEN, 0, is_delete, 0);


                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZE_DOMAIN_LEN, 0, is_delete);















963
         } else if (strncmp(data, KEYWORD_NO_INITIALIZE_DOMAIN, KEYWORD_NO_INITIALIZE_DOMAIN_LEN) == 0) {
         } else if (strncmp(data, KEYWORD_NO_INITIALIZE_DOMAIN, KEYWORD_NO_INITIALIZE_DOMAIN_LEN) == 0) {















964


                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZE_DOMAIN_LEN, 1, is_delete, 0);


                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZE_DOMAIN_LEN, 1, is_delete);
















         } else if (strncmp(data, KEYWORD_INITIALIZER, KEYWORD_INITIALIZER_LEN) == 0) {


 
















                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZER_LEN, 0, is_delete, 1);


 
















         } else if (strncmp(data, KEYWORD_NO_INITIALIZER, KEYWORD_NO_INITIALIZER_LEN) == 0) {


 
















                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZER_LEN, 1, is_delete, 1);


 















965
         } else if (strncmp(data, KEYWORD_ALIAS, KEYWORD_ALIAS_LEN) == 0) {
         } else if (strncmp(data, KEYWORD_ALIAS, KEYWORD_ALIAS_LEN) == 0) {

















966
                 return AddAliasPolicy(data + KEYWORD_ALIAS_LEN, is_delete);
                 return AddAliasPolicy(data + KEYWORD_ALIAS_LEN, is_delete);

















967
         } else if (strncmp(data, KEYWORD_AGGREGATOR, KEYWORD_AGGREGATOR_LEN) == 0) {
         } else if (strncmp(data, KEYWORD_AGGREGATOR, KEYWORD_AGGREGATOR_LEN) == 0) {











#

Line 1130 
 void CCS_LoadPolicy(const char *filename


Line 1126 
 void CCS_LoadPolicy(const char *filename












1126
         printk("SAKURA: 1.5.0-pre   2007/08/16\n");
         printk("SAKURA: 1.5.0-pre   2007/08/16\n");

















1127
 #endif
 #endif

















1128
 #ifdef CONFIG_TOMOYO
 #ifdef CONFIG_TOMOYO















1129


         printk("TOMOYO: 1.5.0-pre   2007/08/15\n");


         printk("TOMOYO: 1.5.0-pre   2007/08/17\n");















1130
 #endif
 #endif

















1131
         if (!profile_loaded) {
         if (!profile_loaded) {

















1132
                 char *argv[2], *envp[3];
                 char *argv[2], *envp[3];











#

Line 1390 
 static int ReadUpdatesCounter(struct io_


Line 1386 
 static int ReadUpdatesCounter(struct io_












1386
 static int ReadVersion(struct io_buffer *head)
 static int ReadVersion(struct io_buffer *head)

















1387
 {
 {

















1388
         if (!head->read_eof) {
         if (!head->read_eof) {















1389


                 if (io_printf(head, "1\n") == 0) head->read_eof = 1;


                 if (io_printf(head, "1.5.0-pre") == 0) head->read_eof = 1;















1390
         }
         }

















1391
         return 0;
         return 0;

















1392
 }
 }





























Legend:



Removed from v.357
 


changed lines


 
Added in v.366













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[tomoyo]/trunk/1.6.x/ccs-patch/fs/ccs_common.c
-revision 357 by kumaneko,
Thu Aug 16 08:16:36 2007 UTC
+revision 366 by kumaneko,
Fri Aug 17 04:44:33 2007 UTC
 Line 5
   *
   * Copyright (C) 2005-2007  NTT DATA CORPORATION
   *
-  * Version: 1.5.0-pre   2007/08/12
+  * Version: 1.5.0-pre   2007/08/17
   *
   * This file is applicable to both 2.4.30 and 2.6.11 and later.
   * See README.ccs for ChangeLog.
 Line 959 
 static int AddExceptionPolicy(struct io_
          } else if (strncmp(data, KEYWORD_NO_KEEP_DOMAIN, KEYWORD_NO_KEEP_DOMAIN_LEN) == 0) {
                  return AddDomainKeeperPolicy(data + KEYWORD_NO_KEEP_DOMAIN_LEN, 1, is_delete);
          } else if (strncmp(data, KEYWORD_INITIALIZE_DOMAIN, KEYWORD_INITIALIZE_DOMAIN_LEN) == 0) {
-                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZE_DOMAIN_LEN, 0, is_delete, 0);
+                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZE_DOMAIN_LEN, 0, is_delete);
          } else if (strncmp(data, KEYWORD_NO_INITIALIZE_DOMAIN, KEYWORD_NO_INITIALIZE_DOMAIN_LEN) == 0) {
-                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZE_DOMAIN_LEN, 1, is_delete, 0);
+                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZE_DOMAIN_LEN, 1, is_delete);
-         } else if (strncmp(data, KEYWORD_INITIALIZER, KEYWORD_INITIALIZER_LEN) == 0) {
-                 return AddDomainInitializerPolicy(data + KEYWORD_INITIALIZER_LEN, 0, is_delete, 1);
-         } else if (strncmp(data, KEYWORD_NO_INITIALIZER, KEYWORD_NO_INITIALIZER_LEN) == 0) {
-                 return AddDomainInitializerPolicy(data + KEYWORD_NO_INITIALIZER_LEN, 1, is_delete, 1);
          } else if (strncmp(data, KEYWORD_ALIAS, KEYWORD_ALIAS_LEN) == 0) {
                  return AddAliasPolicy(data + KEYWORD_ALIAS_LEN, is_delete);
          } else if (strncmp(data, KEYWORD_AGGREGATOR, KEYWORD_AGGREGATOR_LEN) == 0) {
-Line 1130 
 void CCS_LoadPolicy(const char *filename
+Line 1126 
 void CCS_LoadPolicy(const char *filename
          printk("SAKURA: 1.5.0-pre   2007/08/16\n");
  #endif
  #ifdef CONFIG_TOMOYO
-         printk("TOMOYO: 1.5.0-pre   2007/08/15\n");
+         printk("TOMOYO: 1.5.0-pre   2007/08/17\n");
  #endif
          if (!profile_loaded) {
                  char *argv[2], *envp[3];
-Line 1390 
 static int ReadUpdatesCounter(struct io_
+Line 1386 
 static int ReadUpdatesCounter(struct io_
  static int ReadVersion(struct io_buffer *head)
  {
          if (!head->read_eof) {
-                 if (io_printf(head, "1\n") == 0) head->read_eof = 1;
+                 if (io_printf(head, "1.5.0-pre") == 0) head->read_eof = 1;
          }
          return 0;
  }
 Legend:



Removed from v.357
 


changed lines


 
Added in v.366
 Legend:



Removed from v.357
 


changed lines


 
Added in v.366
-Removed from v.357
+Added in v.366
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照